From fdbd1e482fbf9769f0a15fa6201179f01072903c Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sat, 11 May 2024 17:03:37 +0800 Subject: [PATCH] portal --- pom.xml | 4 +- .../PortalApplication.java} | 10 +- .../apiadmin/AdminHomeRest.java | 2 +- .../yxt/portal/apiadmin/DictCommonRest.java | 164 +++++++++++ .../com/yxt/portal/apiadmin/DictTypeRest.java | 105 +++++++ .../{user => portal}/apiadmin/SmsRest.java | 9 +- .../apiadmin/SysFunctionRest.java | 10 +- .../apiadmin/SysMenuRest.java | 126 +++++--- .../yxt/portal/apiadmin/SysMenuRoleRest.java | 159 ++++++++++ .../apiadmin/SysOrganizationRest.java | 171 +++++++---- .../apiadmin/SysPostRest.java | 59 ++-- .../apiadmin/SysRoleRest.java | 58 ++-- .../apiadmin/SysSourceRest.java | 9 +- .../apiadmin/SysStaffOrgRest.java | 4 +- .../apiadmin/SysStaffPostRest.java | 15 +- .../apiadmin/SysStaffinfoRest.java | 12 +- .../apiadmin/SysUserDefaultOrgRest.java | 8 +- .../apiadmin/SysUserRest.java | 272 +++++++++++++----- .../apiadmin/SysUserRoleRest.java | 59 ++-- .../{user => portal}/apiwx/WxHomeRest.java | 2 +- .../yxt/portal/biz/dictcommon/DictCommon.java | 25 ++ .../portal/biz/dictcommon/DictCommonDto.java | 36 +++ .../biz/dictcommon/DictCommonFeign.java | 65 +++++ .../dictcommon/DictCommonFeignFallback.java | 57 ++++ .../biz/dictcommon/DictCommonMapper.java | 60 ++++ .../biz/dictcommon/DictCommonMapper.xml | 43 +++ .../biz/dictcommon/DictCommonQuery.java | 24 ++ .../biz/dictcommon/DictCommonService.java | 77 +++++ .../biz/dictcommon/DictCommonTypeQuery.java | 21 ++ .../portal/biz/dictcommon/DictCommonVo.java | 32 +++ .../com/yxt/portal/biz/dicttype/DictType.java | 21 ++ .../yxt/portal/biz/dicttype/DictTypeDto.java | 30 ++ .../portal/biz/dicttype/DictTypeFeign.java | 46 +++ .../biz/dicttype/DictTypeFeignFallback.java | 34 +++ .../portal/biz/dicttype/DictTypeMapper.java | 28 ++ .../portal/biz/dicttype/DictTypeMapper.xml | 17 ++ .../portal/biz/dicttype/DictTypeQuery.java | 24 ++ .../portal/biz/dicttype/DictTypeService.java | 50 ++++ .../yxt/portal/biz/dicttype/DictTypeVo.java | 32 +++ .../{user => portal}/biz/package-info.java | 2 +- .../yxt/{user => portal}/biz/sms/SmsDto.java | 2 +- .../{user => portal}/biz/sms/SmsFeign.java | 2 +- .../biz/sms/SmsFeignFallback.java | 2 +- .../sysfunction/ButtonPermissionQuery.java | 2 +- .../biz/sysfunction/ButtonPermissionVo.java | 2 +- .../biz/sysfunction/SysFunction.java | 2 +- .../biz/sysfunction/SysFunctionDto.java | 2 +- .../biz/sysfunction/SysFunctionMapper.java | 2 +- .../biz/sysfunction/SysFunctionMapper.xml | 14 +- .../biz/sysfunction/SysFunctionQuery.java | 2 +- .../biz/sysfunction/SysFunctionService.java | 4 +- .../biz/sysfunction/SysFunctionTreeVo.java | 2 +- .../biz/sysfunction/SysFunctionVo.java | 2 +- .../{user => portal}/biz/sysmenu/SysMenu.java | 2 +- .../biz/sysmenu/SysMenuDto.java | 2 +- .../biz/sysmenu/SysMenuFunctionQuery.java | 2 +- .../biz/sysmenu/SysMenuMapper.java | 2 +- .../biz/sysmenu/SysMenuMapper.xml | 16 +- .../biz/sysmenu/SysMenuQuery.java | 2 +- .../biz/sysmenu/SysMenuService.java | 188 ++++++------ .../biz/sysmenu/SysMenuTreeVo.java | 2 +- .../biz/sysmenu/SysMenuVo.java | 2 +- .../portal/biz/sysmenurole/MenuRoleVo.java | 19 ++ .../portal/biz/sysmenurole/SysMenuRole.java | 37 +++ .../biz/sysmenurole/SysMenuRoleDataDto.java | 30 ++ .../biz/sysmenurole/SysMenuRoleDataQuery.java | 30 ++ .../biz/sysmenurole/SysMenuRoleDataVo.java | 32 +++ .../biz/sysmenurole/SysMenuRoleDto.java | 31 ++ .../biz/sysmenurole/SysMenuRoleMapper.java | 60 ++++ .../biz/sysmenurole/SysMenuRoleMapper.xml | 74 +++++ .../biz/sysmenurole/SysMenuRoleQuery.java | 40 +++ .../biz/sysmenurole/SysMenuRoleService.java | 213 ++++++++++++++ .../portal/biz/sysmenurole/SysMenuRoleVo.java | 56 ++++ .../AppContactSysOrganizationVo.java | 2 +- .../biz/sysorganization/QrCodeVo.java | 2 +- .../biz/sysorganization/SysOrgListVo.java | 2 +- .../biz/sysorganization/SysOrgStaffVo.java | 2 +- .../biz/sysorganization/SysOrgVo.java | 2 +- .../biz/sysorganization/SysOrganization.java | 2 +- .../sysorganization/SysOrganizationDto.java | 2 +- .../SysOrganizationListQuery.java | 2 +- .../SysOrganizationListVo.java | 2 +- .../SysOrganizationListsVo.java | 2 +- .../SysOrganizationMapper.java | 4 +- .../sysorganization/SysOrganizationMapper.xml | 50 ++-- .../sysorganization/SysOrganizationQuery.java | 2 +- .../SysOrganizationService.java | 14 +- .../sysorganization/SysOrganizationVo.java | 2 +- .../{user => portal}/biz/syspost/SysPost.java | 2 +- .../biz/syspost/SysPostDto.java | 2 +- .../biz/syspost/SysPostListVo.java | 2 +- .../biz/syspost/SysPostMapper.java | 5 +- .../biz/syspost/SysPostMapper.xml | 10 +- .../biz/syspost/SysPostQuery.java | 2 +- .../biz/syspost/SysPostService.java | 8 +- .../biz/syspost/SysPostVo.java | 2 +- .../{user => portal}/biz/sysrole/SysRole.java | 2 +- .../biz/sysrole/SysRoleDto.java | 2 +- .../biz/sysrole/SysRoleMapper.java | 4 +- .../biz/sysrole/SysRoleMapper.xml | 18 +- .../biz/sysrole/SysRoleQuery.java | 2 +- .../biz/sysrole/SysRoleService.java | 6 +- .../biz/sysrole/SysRoleVo.java | 2 +- .../biz/syssource/SysSource.java | 2 +- .../biz/syssource/SysSourceDto.java | 2 +- .../biz/syssource/SysSourceFeign.java | 2 +- .../biz/syssource/SysSourceFeignFallback.java | 2 +- .../biz/syssource/SysSourceMapper.java | 6 +- .../biz/syssource/SysSourceMapper.xml | 12 +- .../biz/syssource/SysSourceQuery.java | 2 +- .../biz/syssource/SysSourceService.java | 6 +- .../biz/syssource/SysSourceVo.java | 4 +- .../sysstaffinfo/AppContactsDetailsVo.java | 2 +- .../biz/sysstaffinfo/PcSysStaffQuery.java | 2 +- .../biz/sysstaffinfo/PcSysStaffVo.java | 2 +- .../biz/sysstaffinfo/SysStaffQuery.java | 2 +- .../biz/sysstaffinfo/SysStaffinfo.java | 2 +- .../SysStaffinfoAppContactsSearchVo.java | 2 +- .../SysStaffinfoAppContactsVo.java | 2 +- .../sysstaffinfo/SysStaffinfoDetailsVo.java | 6 +- .../biz/sysstaffinfo/SysStaffinfoDto.java | 6 +- .../biz/sysstaffinfo/SysStaffinfoMapper.java | 7 +- .../biz/sysstaffinfo/SysStaffinfoMapper.xml | 34 +-- .../biz/sysstaffinfo/SysStaffinfoQuery.java | 2 +- .../biz/sysstaffinfo/SysStaffinfoService.java | 44 +-- .../biz/sysstaffinfo/SysStaffinfoVo.java | 2 +- .../biz/sysstaffinfo/WxBase64Query.java | 2 +- .../biz/sysstaffinfo/WxSysInfoQuery.java | 2 +- .../sysstaffinfo/app/AppSysStaffQuery.java | 2 +- .../biz/sysstaffinfo/app/AppSysStaffVo.java | 2 +- .../biz/sysstafforg/SysStaffOrg.java | 2 +- .../biz/sysstafforg/SysStaffOrgByUserVo.java | 2 +- .../biz/sysstafforg/SysStaffOrgDetailsVo.java | 2 +- .../biz/sysstafforg/SysStaffOrgDto.java | 2 +- .../biz/sysstafforg/SysStaffOrgMapper.java | 4 +- .../biz/sysstafforg/SysStaffOrgMapper.xml | 26 +- .../biz/sysstafforg/SysStaffOrgQuery.java | 2 +- .../biz/sysstafforg/SysStaffOrgService.java | 13 +- .../biz/sysstafforg/SysStaffOrgVo.java | 2 +- .../biz/sysstaffpost/SysStaffPost.java | 2 +- .../sysstaffpost/SysStaffPostDetailsVo.java | 2 +- .../biz/sysstaffpost/SysStaffPostDto.java | 2 +- .../biz/sysstaffpost/SysStaffPostMapper.java | 2 +- .../biz/sysstaffpost/SysStaffPostMapper.xml | 12 +- .../biz/sysstaffpost/SysStaffPostQuery.java | 2 +- .../biz/sysstaffpost/SysStaffPostService.java | 2 +- .../biz/sysstaffpost/SysStaffPostVo.java | 2 +- .../biz/sysuser/PrivilegeQuery.java | 2 +- .../biz/sysuser/ShareUserQuery.java | 2 +- .../biz/sysuser/SysHaveMessageQuery.java | 2 +- .../biz/sysuser/SysMenuRoleVoList.java | 2 +- .../{user => portal}/biz/sysuser/SysUser.java | 2 +- .../biz/sysuser/SysUserDto.java | 2 +- .../biz/sysuser/SysUserInfoVo.java | 2 +- .../biz/sysuser/SysUserListVo.java | 2 +- .../biz/sysuser/SysUserMapper.java | 15 +- .../biz/sysuser/SysUserMapper.xml | 46 +-- .../biz/sysuser/SysUserQuery.java | 2 +- .../biz/sysuser/SysUserService.java | 127 +++++--- .../biz/sysuser/SysUserVo.java | 6 +- .../biz/sysuser/UserByRolesAndOrgQuery.java | 2 +- .../biz/sysuser/UserQuery.java | 2 +- .../biz/sysuser/UserRoleQuery.java | 2 +- .../biz/sysuser/UserssQuery.java | 2 +- .../biz/sysuser/app/AppMySysUserInfo.java | 2 +- .../biz/sysuser/app/AppUserOrgInfoVo.java | 2 +- .../biz/sysuser/app/MyInfoQuery.java | 2 +- .../biz/sysuser/app/OrgList.java | 2 +- .../biz/sysuser/wx/WxHomePageVo.java | 2 +- .../biz/sysuser/wx/WxMySysUserInfoVo.java | 2 +- .../biz/sysuser/wx/WxSysUserDto.java | 2 +- .../biz/sysuser/wx/WxSysUserLoginQuery.java | 2 +- .../biz/sysuser/wx/WxSysUserRegistQuery.java | 2 +- .../biz/sysuser/wx/WxSysUserVo.java | 2 +- .../biz/sysuserdefaultorg/SysOrgPathList.java | 2 +- .../sysuserdefaultorg/SysUserDefaultOrg.java | 2 +- .../SysUserDefaultOrgDto.java | 2 +- .../SysUserDefaultOrgMapper.java | 2 +- .../SysUserDefaultOrgMapper.xml | 4 +- .../SysUserDefaultOrgQuery.java | 2 +- .../SysUserDefaultOrgService.java | 9 +- .../SysUserDefaultOrgVo.java | 2 +- .../biz/sysuserrole/SysUserRole.java | 2 +- .../biz/sysuserrole/SysUserRoleDto.java | 2 +- .../biz/sysuserrole/SysUserRoleMapper.java | 2 +- .../biz/sysuserrole/SysUserRoleMapper.xml | 8 +- .../biz/sysuserrole/SysUserRoleQuery.java | 2 +- .../biz/sysuserrole/SysUserRoleService.java | 2 +- .../biz/sysuserrole/SysUserRoleVo.java | 2 +- .../config/DictCommonType.java | 2 +- .../config/SaTokenConfigure.java | 2 +- .../config/SaTokenGloableException.java | 2 +- .../feign => portal/config}/package-info.java | 2 +- .../config => portal/feign}/package-info.java | 2 +- .../{user => portal}/utils/DoubleUtils.java | 2 +- .../com/yxt/{user => portal}/utils/MsgWs.java | 5 +- .../{user => portal}/utils/PinYinUtils.java | 2 +- .../{user => portal}/utils/StyleUtils.java | 2 +- 198 files changed, 2841 insertions(+), 730 deletions(-) rename src/main/java/com/yxt/{user/UserApplication.java => portal/PortalApplication.java} (75%) rename src/main/java/com/yxt/{user => portal}/apiadmin/AdminHomeRest.java (88%) create mode 100644 src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java create mode 100644 src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java rename src/main/java/com/yxt/{user => portal}/apiadmin/SmsRest.java (84%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysFunctionRest.java (97%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysMenuRest.java (69%) create mode 100644 src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java rename src/main/java/com/yxt/{user => portal}/apiadmin/SysOrganizationRest.java (71%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysPostRest.java (64%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysRoleRest.java (66%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysSourceRest.java (95%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysStaffOrgRest.java (98%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysStaffPostRest.java (91%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysStaffinfoRest.java (96%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysUserDefaultOrgRest.java (78%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysUserRest.java (71%) rename src/main/java/com/yxt/{user => portal}/apiadmin/SysUserRoleRest.java (61%) rename src/main/java/com/yxt/{user => portal}/apiwx/WxHomeRest.java (88%) create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonQuery.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonTypeQuery.java create mode 100644 src/main/java/com/yxt/portal/biz/dictcommon/DictCommonVo.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictType.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeDto.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeign.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeignFallback.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.xml create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeQuery.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeService.java create mode 100644 src/main/java/com/yxt/portal/biz/dicttype/DictTypeVo.java rename src/main/java/com/yxt/{user => portal}/biz/package-info.java (69%) rename src/main/java/com/yxt/{user => portal}/biz/sms/SmsDto.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sms/SmsFeign.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sms/SmsFeignFallback.java (88%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/ButtonPermissionQuery.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/ButtonPermissionVo.java (88%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunction.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunctionDto.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunctionMapper.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunctionMapper.xml (86%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunctionQuery.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunctionService.java (99%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunctionTreeVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysfunction/SysFunctionVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenu.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuDto.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuFunctionQuery.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuMapper.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuMapper.xml (81%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuQuery.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuService.java (70%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuTreeVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysmenu/SysMenuVo.java (98%) create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/MenuRoleVo.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRole.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataDto.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataQuery.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataVo.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDto.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.xml create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleQuery.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleService.java create mode 100644 src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleVo.java rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/AppContactSysOrganizationVo.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/QrCodeVo.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrgListVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrgStaffVo.java (87%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrgVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganization.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationDto.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationListQuery.java (87%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationListVo.java (90%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationListsVo.java (87%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationMapper.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationMapper.xml (73%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationQuery.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationService.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysorganization/SysOrganizationVo.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPost.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPostDto.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPostListVo.java (93%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPostMapper.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPostMapper.xml (78%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPostQuery.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPostService.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/syspost/SysPostVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysrole/SysRole.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysrole/SysRoleDto.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysrole/SysRoleMapper.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysrole/SysRoleMapper.xml (86%) rename src/main/java/com/yxt/{user => portal}/biz/sysrole/SysRoleQuery.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysrole/SysRoleService.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysrole/SysRoleVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSource.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceDto.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceFeign.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceFeignFallback.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceMapper.java (91%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceMapper.xml (69%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceQuery.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceService.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/syssource/SysSourceVo.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/AppContactsDetailsVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/PcSysStaffQuery.java (90%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/PcSysStaffVo.java (91%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffQuery.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfo.java (99%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoAppContactsVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoDetailsVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoDto.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoMapper.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoMapper.xml (90%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoQuery.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoService.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/SysStaffinfoVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/WxBase64Query.java (91%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/WxSysInfoQuery.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/app/AppSysStaffQuery.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffinfo/app/AppSysStaffVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrg.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgByUserVo.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgDetailsVo.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgDto.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgMapper.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgMapper.xml (80%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgQuery.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgService.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysstafforg/SysStaffOrgVo.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPost.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPostDetailsVo.java (93%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPostDto.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPostMapper.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPostMapper.xml (74%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPostQuery.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPostService.java (99%) rename src/main/java/com/yxt/{user => portal}/biz/sysstaffpost/SysStaffPostVo.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/PrivilegeQuery.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/ShareUserQuery.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysHaveMessageQuery.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysMenuRoleVoList.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUser.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserDto.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserInfoVo.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserListVo.java (89%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserMapper.java (93%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserMapper.xml (88%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserQuery.java (97%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserService.java (93%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/SysUserVo.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/UserByRolesAndOrgQuery.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/UserQuery.java (93%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/UserRoleQuery.java (91%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/UserssQuery.java (88%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/app/AppMySysUserInfo.java (93%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/app/AppUserOrgInfoVo.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/app/MyInfoQuery.java (91%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/app/OrgList.java (89%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/wx/WxHomePageVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/wx/WxMySysUserInfoVo.java (94%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/wx/WxSysUserDto.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/wx/WxSysUserLoginQuery.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/wx/WxSysUserRegistQuery.java (91%) rename src/main/java/com/yxt/{user => portal}/biz/sysuser/wx/WxSysUserVo.java (96%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysOrgPathList.java (90%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysUserDefaultOrg.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysUserDefaultOrgDto.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java (88%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml (69%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysUserDefaultOrgQuery.java (85%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysUserDefaultOrgService.java (92%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java (93%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserrole/SysUserRole.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserrole/SysUserRoleDto.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserrole/SysUserRoleMapper.java (98%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserrole/SysUserRoleMapper.xml (82%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserrole/SysUserRoleQuery.java (95%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserrole/SysUserRoleService.java (99%) rename src/main/java/com/yxt/{user => portal}/biz/sysuserrole/SysUserRoleVo.java (95%) rename src/main/java/com/yxt/{user => portal}/config/DictCommonType.java (99%) rename src/main/java/com/yxt/{user => portal}/config/SaTokenConfigure.java (99%) rename src/main/java/com/yxt/{user => portal}/config/SaTokenGloableException.java (98%) rename src/main/java/com/yxt/{user/feign => portal/config}/package-info.java (77%) rename src/main/java/com/yxt/{user/config => portal/feign}/package-info.java (77%) rename src/main/java/com/yxt/{user => portal}/utils/DoubleUtils.java (98%) rename src/main/java/com/yxt/{user => portal}/utils/MsgWs.java (92%) rename src/main/java/com/yxt/{user => portal}/utils/PinYinUtils.java (99%) rename src/main/java/com/yxt/{user => portal}/utils/StyleUtils.java (99%) diff --git a/pom.xml b/pom.xml index 2305cda..8bed395 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ 4.0.0 - ss-common-user - ss-common-user + ss-common-portal + ss-common-portal 2.0.1 diff --git a/src/main/java/com/yxt/user/UserApplication.java b/src/main/java/com/yxt/portal/PortalApplication.java similarity index 75% rename from src/main/java/com/yxt/user/UserApplication.java rename to src/main/java/com/yxt/portal/PortalApplication.java index 52f7e15..686c12c 100644 --- a/src/main/java/com/yxt/user/UserApplication.java +++ b/src/main/java/com/yxt/portal/PortalApplication.java @@ -1,4 +1,4 @@ -package com.yxt.user; +package com.yxt.portal; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,15 +10,15 @@ import org.springframework.scheduling.annotation.EnableScheduling; * @date 2024/4/28 14:43 */ @SpringBootApplication(scanBasePackages = { - "com.yxt.user.config", + "com.yxt.portal.config", "com.yxt.common.base.config", - "com.yxt.user" + "com.yxt.portal" }) // 启用自带定时任务 @EnableScheduling @EnableFeignClients(basePackages = {}) -public class UserApplication { +public class PortalApplication { public static void main(String[] args) { - SpringApplication.run(UserApplication.class, args); + SpringApplication.run(PortalApplication.class, args); } } diff --git a/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java b/src/main/java/com/yxt/portal/apiadmin/AdminHomeRest.java similarity index 88% rename from src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java rename to src/main/java/com/yxt/portal/apiadmin/AdminHomeRest.java index 779af32..9a077c4 100644 --- a/src/main/java/com/yxt/user/apiadmin/AdminHomeRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/AdminHomeRest.java @@ -1,4 +1,4 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java new file mode 100644 index 0000000..ac0c27a --- /dev/null +++ b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java @@ -0,0 +1,164 @@ +package com.yxt.portal.apiadmin; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.dictcommon.*; +import com.yxt.portal.biz.dicttype.DictTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/7/5 21:29 + * @description + */ +@Slf4j +@Controller +@RequestMapping("apiadmin/dictcommons") +@Api(tags = "数据字典数据项管理") +public class DictCommonRest { + + @Autowired + private DictTypeService dictTypeService; + + @Autowired + private DictCommonService dictCommonService; + + @PostMapping(value = "/save") + @ResponseBody + @ApiOperation(value = "数据字典数据项保存") + ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto) { + ResultBean resultBean = ResultBean.fireFail(); + //数据类型 + String dictType = dictCommonDto.getDictType(); + //数据项值 + String dictKey = dictCommonDto.getDictKey(); + //父级sid + String parentSid = dictCommonDto.getParentSid(); + int size = dictTypeService.selectSize(dictType); + if (size > 0) { + //根据数据类型和数据项值查询是否已存在 + DictCommon dc = dictCommonService.selectSize(dictKey, dictType, parentSid); + if (dc != null) { + return resultBean.setMsg(dictType + "此类型的数据项已存在"); + } + DictCommon dictCommon = new DictCommon(); + dictCommonDto.fillEntity(dictCommon); + boolean isSave = dictCommonService.save(dictCommon); + if (!isSave) { + return resultBean.setMsg("保存数据项失败"); + } + } else { + return resultBean.setMsg("数据字典类型不存在"); + } + return resultBean.success().setMsg("保存成功"); + } + + @PostMapping("/pageList") + @ResponseBody + @ApiOperation(value = "数据字典数据项分页列表") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = new PagerVo<>(); + IPage p2 = dictCommonService.pageList(pagerQuery); + PagerVo pv1 = PagerUtil.pageToVo(p2, pv); + return rb.success().setData(pv1); + } + + @PostMapping("/update/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典修改后保存") + ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){ + ResultBean resultBean = ResultBean.fireFail(); + //数据类型 + String dictType = dictCommonDto.getDictType(); + int size = dictTypeService.selectSize(dictType); + if (size > 0) { + //根据数据类型和数据项值查询是否已存在 + DictCommon dc = dictCommonService.fetchBySid(sid); + if (dc == null) { + return resultBean.setMsg(dictType + "此类型的数据项不存在"); + } else { + if (!sid.equals(dc.getSid())) { + return resultBean.setMsg(dictType + "此类型的数据项已存在"); + } + } + if (0 == dictCommonService.updateBySid(dictCommonDto.toMap(), sid)) { + return resultBean.setMsg("更新失败"); + } + } else { + return resultBean.setMsg("数据字典类型不存在"); + } + return resultBean.success().setMsg("保存成功"); + } + + @ResponseBody + @DeleteMapping("/delete/{sid}") + @ApiOperation(value = "删除") + ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){ + DictCommon dictCommon = dictCommonService.fetchBySid(sid); + if (null == dictCommon) { + return ResultBean.fireFail().setMsg("该数据项不存在"); + } + if (0 == dictCommonService.deleteBySid(sid)) { + return ResultBean.fireFail().setMsg("删除失败"); + } + return ResultBean.fireSuccess().setMsg("删除成功"); + } + + @GetMapping("/typeValues") + @ResponseBody + @ApiOperation("下拉框的获取") + ResultBean> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid){ + DictCommonTypeQuery query = new DictCommonTypeQuery(); + query.setType(type); + query.setPsid(psid); + List dictCommonVoList = dictCommonService.getValue(query); + if (dictCommonVoList.size() == 0) { + return new ResultBean>().fail().setMsg("该类型无数据项"); + } + return new ResultBean>().success().setData(dictCommonVoList); + } + + @ResponseBody + @GetMapping("/selectBykey/{key}/{type}") + @ApiOperation(value = "数据字典信息修改时的初始化信息") + public ResultBean selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type) { + DictCommonVo v = dictCommonService.selectBykey(key, type); + if (v == null) { + return new ResultBean().success().setData(new DictCommonVo()); + } + return new ResultBean().success().setData(v); + } + + @GetMapping("/getFirstDictKeyByType") + @ResponseBody + @ApiOperation("根据数据字典的key获取第一个值（默认值）") + ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid){ + ResultBean> resultBean = getTypeValues(dictType, psid); + if (resultBean.getSuccess() && resultBean.getData() != null) { + String dictKey = resultBean.getData().get(0).getDictKey(); + return new ResultBean().success().setData(dictKey); + } else { + return new ResultBean().fail().setData(new DictCommon()); + } + } + + @GetMapping("/getTypeValueList") + @ResponseBody + @ApiOperation("根据分类编码和数据分组查询数据字典") + ResultBean> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum){ + return dictCommonService.getList(type,groupNum); + } +} diff --git a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java new file mode 100644 index 0000000..4e3b6e2 --- /dev/null +++ b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java @@ -0,0 +1,105 @@ +package com.yxt.portal.apiadmin; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.dictcommon.DictCommon; +import com.yxt.portal.biz.dictcommon.DictCommonService; +import com.yxt.portal.biz.dicttype.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/7/5 22:37 + * @description + */ +@Slf4j +@Controller +@RequestMapping("apiadmin/dicttypes") +@Api(tags = "数据字典类型管理") +public class DictTypeRest{ + + @Autowired + private DictTypeService dictTypeService; + + @Autowired + private DictCommonService dictCommonService; + + + @PostMapping(value = "/save") + @ResponseBody + @ApiOperation(value = "数据字典类型保存") + ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto){ + ResultBean resultBean = ResultBean.fireFail(); + DictType dictType = new DictType(); + //判断数据字典类型是否已存在 + String dictTypeCode = dictTypeDto.getDictTypeCode(); + int size = dictTypeService.selectSize(dictTypeCode); + if (size > 0) { + return resultBean.setMsg("数据类型代码已存在"); + } + dictTypeDto.fillEntity(dictType); + boolean isSave = dictTypeService.save(dictType); + if (!isSave) { + return resultBean.setMsg("保存失败"); + } + return resultBean.success().setMsg("保存成功"); + } + @PostMapping("/pageList") + @ResponseBody + @ApiOperation(value = "数据字典类型分页列表") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery){ + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = new PagerVo<>(); + IPage p2 = dictTypeService.pageList(pagerQuery); + PagerVo pv1 = PagerUtil.pageToVo(p2, pv); + return rb.success().setData(pv1); + } + + @PostMapping("/update/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典类型更新") + ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid){ + DictType dictType = dictTypeService.fetchBySid(sid); + if (null == dictType) { + return ResultBean.fireFail().setMsg("该数据字典类型不存在"); + } + if (!dictTypeDto.getDictTypeCode().equals(dictType.getDictTypeCode())) { + return ResultBean.fireFail().setMsg("数据字典类型的code值不允许修改"); + } + if (0 == dictTypeService.updateBySid(dictTypeDto.toMap(), sid)) { + return ResultBean.fireFail().setMsg("更新失败"); + } + return ResultBean.fireSuccess().setMsg("更新成功"); + } + + @DeleteMapping("/delete/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典类型删除") + ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid){ + DictType dictType = dictTypeService.fetchBySid(sid); + if (null == dictType) { + return ResultBean.fireFail().setMsg("该数据字典类型不存在"); + } + //查询该类型下是否存在数据项 + List dictCommon = dictCommonService.selectByType(dictType.getDictTypeCode()); + if (dictCommon.size() > 0) { + return ResultBean.fireFail().setMsg("该数据字典类型下存在数据项，请先删除该类下的数据项"); + } + if (0 == dictTypeService.deleteBySid(sid)) { + return ResultBean.fireFail().setMsg("删除失败"); + } + return ResultBean.fireSuccess().setMsg("删除成功"); + } +} diff --git a/src/main/java/com/yxt/user/apiadmin/SmsRest.java b/src/main/java/com/yxt/portal/apiadmin/SmsRest.java similarity index 84% rename from src/main/java/com/yxt/user/apiadmin/SmsRest.java rename to src/main/java/com/yxt/portal/apiadmin/SmsRest.java index 1bc8269..1192489 100644 --- a/src/main/java/com/yxt/user/apiadmin/SmsRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SmsRest.java @@ -1,12 +1,9 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; -import com.yxt.user.biz.sms.SmsDto; -import com.yxt.user.biz.sms.SmsFeign; -import com.yxt.user.utils.MsgWs; +import com.yxt.portal.biz.sms.SmsDto; +import com.yxt.portal.utils.MsgWs; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; -import com.yxt.user.biz.sms.SmsDto; -import com.yxt.user.utils.MsgWs; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java b/src/main/java/com/yxt/portal/apiadmin/SysFunctionRest.java similarity index 97% rename from src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysFunctionRest.java index 12c0e8d..243aa8f 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysFunctionRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysFunctionRest.java @@ -1,11 +1,11 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import cn.hutool.core.bean.BeanUtil; -import com.yxt.user.biz.sysfunction.*; -import com.yxt.user.biz.syssource.SysSource; -import com.yxt.user.biz.syssource.SysSourceVo; +import com.yxt.portal.biz.sysfunction.*; +import com.yxt.portal.biz.syssource.SysSource; +import com.yxt.portal.biz.syssource.SysSourceVo; //import com.yxt.user.biz.syssourcefunction.SysSourceFunction; -import com.yxt.user.biz.syssource.SysSourceService; +import com.yxt.portal.biz.syssource.SysSourceService; //import com.yxt.user.biz.syssourcefunction.SysSourceFunctionService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; diff --git a/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java similarity index 69% rename from src/main/java/com/yxt/user/apiadmin/SysMenuRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java index 340bdfd..81f9d6d 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysMenuRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java @@ -1,31 +1,31 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; -import com.yxt.user.biz.sysmenu.*; +import com.yxt.portal.biz.sysmenu.*; //import com.yxt.user.biz.sysmenurole.SysMenuRoleQuery; -import com.yxt.user.biz.sysrole.SysRole; -import com.yxt.user.biz.syssource.SysSource; -import com.yxt.user.biz.syssource.SysSourceVo; +import com.yxt.portal.biz.sysmenurole.SysMenuRoleQuery; +import com.yxt.portal.biz.sysmenurole.SysMenuRoleService; +import com.yxt.portal.biz.sysrole.SysRole; +import com.yxt.portal.biz.syssource.SysSource; +import com.yxt.portal.biz.syssource.SysSourceVo; //import com.yxt.user.biz.syssourcemenu.SysSourceMenu; //import com.yxt.user.biz.syssourcemenu.SysSourceMenuVo; -import com.yxt.user.biz.sysuserrole.SysUserRoleVo; +import com.yxt.portal.biz.sysuserrole.SysUserRoleVo; //import com.yxt.user.biz.sysmenurole.SysMenuRoleService; -import com.yxt.user.biz.sysrole.SysRoleService; -import com.yxt.user.biz.syssource.SysSourceService; +import com.yxt.portal.biz.sysrole.SysRoleService; +import com.yxt.portal.biz.syssource.SysSourceService; //import com.yxt.user.biz.syssourcemenu.SysSourceMenuService; -import com.yxt.user.biz.sysuser.SysUserService; -import com.yxt.user.biz.sysuserrole.SysUserRoleService; +import com.yxt.portal.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysuserrole.SysUserRoleService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysmenu.*; -import com.yxt.user.biz.syssource.SysSourceService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -57,14 +57,16 @@ public class SysMenuRest { private SysSourceService sysSourceService; @Autowired private SysUserRoleService sysUserRoleService; -// @Autowired -// private SysMenuRoleService sysMenuRoleService; + @Autowired + private SysMenuRoleService sysMenuRoleService; @Autowired private SysUserService sysUserService; @Autowired private SysRoleService sysRoleService; + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = sysMenuService.listPageVo(pq); @@ -78,15 +80,27 @@ public class SysMenuRest { return rb.success().setData(list); }*/ - - public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query) { + /** + * 菜单列表：根据资源归类 + * + * @param query + * @return + */ + @ApiOperation("菜单列表：根据资源归类") + @PostMapping("/listAllVoForSource") + public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query){ ResultBean rb = ResultBean.fireFail(); List list = sysMenuService.listAllVoForSource(query); return rb.success().setData(list); } - - public ResultBean>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) { + /** + * 菜单列表：根据资源归类 设置功能的url用 + * @return + */ + @ApiOperation("菜单列表：根据资源归类 设置功能的url用") + @PostMapping("/getMenusForFunction") + public ResultBean>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) { ResultBean rb = ResultBean.fireFail(); SysMenuQuery smq= new SysMenuQuery(); smq.setSourceSid(sysMenuFunctionQuery.getSourceSid()); @@ -115,8 +129,38 @@ public class SysMenuRest { } } + @ApiOperation("根据用户sid查询所有数据列表 ") + @PostMapping("/sourceMenuTreeByUserSid") + public ResultBean>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query) { + ResultBean>> rb = ResultBean.fireFail(); + SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery(); + List> list = new ArrayList<>(); + if (null == query) + return rb.setData(list); - public ResultBean>> sourcemenutree(SysMenuQuery query) { + //if业务角色存在，则查询业务角色的菜单列表，否则查询平台角色的菜单列表 + List userRole = sysUserRoleService.selectByUserSid(query.getUserSid()); + List roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList()); + for (String roleSid : roleSids) { + SysRole sysRole = sysRoleService.fetchBySid(roleSid); + if(sysRole == null){ + continue; + } + Integer type = sysRoleService.fetchBySid(roleSid).getType(); + if (type == 1){ + orgRoleMenuQuery.setIsAdmin("1"); + }else { + orgRoleMenuQuery.setIsAdmin("0"); + } + } + orgRoleMenuQuery.setRoleSids(roleSids); + orgRoleMenuQuery.setSourceSid(query.getSourceSid()); + list = sysMenuRoleService.getSourceMenuTreeOfRoles(orgRoleMenuQuery, null); + return rb.success().setData(list); + } + @ApiOperation("根据资源sid查询所有数据列表 ") + @PostMapping("/sourcemenutree") + public ResultBean>> sourcemenutree(@RequestBody SysMenuQuery query) { ResultBean>> rb = ResultBean.fireFail(); // SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery(); List> list = new ArrayList<>(); @@ -144,8 +188,9 @@ public class SysMenuRest { return rb.success().setData(list); } - - public ResultBean> listAllByRoleSid(SysMenuQuery query) { + @ApiOperation("根据角色sid条件查询所有数据列表") + @PostMapping("/listAllByRoleSid") + public ResultBean> listAllByRoleSid(@RequestBody SysMenuQuery query) { ResultBean rb = ResultBean.fireFail(); String roleSid = query.getRoleSid(); if (StringUtils.isBlank(roleSid)) { @@ -174,7 +219,9 @@ public class SysMenuRest { } - public ResultBean save(SysMenuDto dto) { + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysMenuDto dto) { ResultBean rb = ResultBean.fireFail(); String sourceSid = dto.getSourceSid(); SysSource sysSource = sysSourceService.fetchBySid(sourceSid); @@ -185,8 +232,9 @@ public class SysMenuRest { return rb.success(); } - - public ResultBean update(SysMenuDto dto, String sid) { + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); //查询菜单是否存在 SysMenu sysMenu = sysMenuService.fetchBySid(sid); @@ -207,8 +255,16 @@ public class SysMenuRest { return rb.success(); } - - public ResultBean updateIsEnable(String sid, Integer isEnable) { + /** + * 修改是否可用的状态 + * + * @param sid 菜单sid或资源sid + * @param isEnable 是否可用的状态：1可用，0不可用 + * @return + */ + @ApiOperation("修改是否可用的状态 ") + @PostMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) { ResultBean rb = ResultBean.fireFail(); SysMenu sysMenu = sysMenuService.fetchBySid(sid); if (sysMenu == null) { @@ -234,9 +290,15 @@ public class SysMenuRest { sysMenuService.delByIds(ids); return rb.success(); }*/ - - - public ResultBean delBySids(String sid) { + /** + * 根据当前行sid删除菜单 + * + * @param sid 菜单sid + * @return + */ + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySids/{sid}") + public ResultBean delBySids(@PathVariable("sid") String sid) { ResultBean rb = ResultBean.fireFail(); SysMenu sysMenu = sysMenuService.fetchBySid(sid); if (sysMenu == null) { diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java new file mode 100644 index 0000000..e29369b --- /dev/null +++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRoleRest.java @@ -0,0 +1,159 @@ +package com.yxt.portal.apiadmin; + +import com.yxt.portal.biz.sysmenurole.*; +import com.yxt.portal.biz.sysrole.SysRole; +import com.yxt.portal.biz.sysrole.SysRoleService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.sysmenurole.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Objects; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleRest
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "菜单与角色关联表") +@RestController +@RequestMapping("v1/sysmenurole") +public class SysMenuRoleRest { + + @Autowired + private SysMenuRoleService sysMenuRoleService; + @Autowired + private SysRoleService sysRoleService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysMenuRoleService.listPageVo(pq); + return rb.success().setData(pv); + } + + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysMenuRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuRoleService.listAllVo(query); + return rb.success().setData(list); + } + + @ApiOperation("根据角色查询授权的菜单列表(PC)") + @PostMapping("/selMenuByRole") + public ResultBean> selMenuByRole(@RequestBody SysMenuRoleDataQuery query) { + return sysMenuRoleService.selMenuByRole(query); + } + + @ApiOperation("根据角色查询授权的菜单列表(APP)") + @PostMapping("/selMenuByRoleApp") + public ResultBean> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query) { + return sysMenuRoleService.selMenuByRoleApp(query); + } + + @ApiOperation("修改角色菜单的数据权限（PC）") + @PostMapping("/updateDataByRoleMenu") + public ResultBean updateDataByRoleMenu(@RequestBody List dtos) { + return sysMenuRoleService.updateDataByRoleMenu(dtos); + } + + @ApiOperation("修改角色菜单的数据权限（移动端）") + @PostMapping("/updateDataByRoleMenuApp") + public ResultBean updateDataByRoleMenuApp(@RequestBody List dtos) { + return sysMenuRoleService.updateDataByRoleMenuApp(dtos); + } + + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuRoleService.listVo(); + return rb.success().setData(list); + } + + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysMenuRoleDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysMenuRoleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + sysMenuRoleService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + + @ApiOperation("修改角色的菜单配置") + @PostMapping("/updateRoleAndMenu") + public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto) { + String roleSid=dto.getRoleSid(); + String menuSid=dto.getMenuSid(); + if(StringUtils.isBlank(roleSid)){ + return ResultBean.fireFail().setMessage("角色sid不能为空"); + }else{ + SysRole sysRole = sysRoleService.fetchBySid(roleSid); + if(sysRole==null||StringUtils.isBlank(sysRole.getSid())){ + return ResultBean.fireFail().setMessage("角色sid不存在"); + } + } + List menuRoleList = sysMenuRoleService.selectByRoleSid(roleSid); + sysMenuRoleService.delByRoleSid(roleSid); + ResultBean rb = ResultBean.fireFail(); + if(!StringUtils.isBlank(menuSid)){ + String[] sids = menuSid.split(","); + for(String sid:sids){ + MenuRoleVo menuRoleVo = menuRoleList.stream().filter(s -> Objects.equals(s.getMenuSid(), sid)).findFirst().orElse(null); + SysMenuRole sysMenuRole = new SysMenuRole(); + sysMenuRole.setRoleSid(roleSid); + sysMenuRole.setMenuSid(sid); + if(menuRoleVo != null){ + sysMenuRole.setDataRuleId(menuRoleVo.getDataRuleId()); + } + sysMenuRoleService.save(sysMenuRole); + } + } + return rb.success(); + } + + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ + ResultBean rb = ResultBean.fireFail(); + sysMenuRoleService.delByIds(ids); + return rb.success(); + } + + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ + ResultBean rb = ResultBean.fireFail(); + SysMenuRoleVo vo = sysMenuRoleService.fetchByIdVo(id); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java b/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java similarity index 71% rename from src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java index 73ba8ef..d8687d2 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysOrganizationRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java @@ -1,4 +1,4 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.config.RedisUtil; @@ -8,18 +8,18 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService; -import com.yxt.user.biz.sysstafforg.SysStaffOrgService; -import com.yxt.user.biz.sysstafforg.SysStaffOrgVo; -import com.yxt.user.biz.sysuser.SysUserService; -import com.yxt.user.biz.sysorganization.*; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo; +import com.yxt.portal.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysorganization.*; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.io.File; import java.util.*; @@ -62,7 +62,8 @@ public class SysOrganizationRest{ return sysOrganizationService.saveOrg(dto); } - + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); String psid = pq.getParams().getPsid(); @@ -74,40 +75,45 @@ public class SysOrganizationRest{ return rb.success().setData(pv); } - + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") public ResultBean> listAll(@RequestBody SysOrganizationQuery query) { ResultBean rb = ResultBean.fireFail(); List list = sysOrganizationService.listAllVo(query); return rb.success().setData(list); } - + @ApiOperation("所有数据列表") + @GetMapping("/list") public ResultBean> list() { ResultBean rb = ResultBean.fireFail(); List list = sysOrganizationService.listVo(); return rb.success().setData(list); } - - public ResultBean save(SysOrganizationDto dto) { + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysOrganizationDto dto) { ResultBean rb = ResultBean.fireFail(); sysOrganizationService.saveOrUpdateDto(dto); return rb.success(); } - - public ResultBean> selectFirstOrgList() { + @ApiOperation("一级组织机构列表") + @GetMapping("/selectFirstOrgList") + public ResultBean> selectFirstOrgList(){ return new ResultBean>().success().setData(sysOrganizationService.selectFirstOrgList()); } - - public ResultBean> selectChildrenListBySid(String sid) { + @ApiOperation("根据父级sid查询子集列表") + @GetMapping("/selectChildrenListBySid/{sid}") + public ResultBean> selectChildrenListBySid(@PathVariable("sid") String sid) { return new ResultBean>().success().setData(sysOrganizationService.selectChildrenListBySid(sid)); } @Transactional(rollbackFor = Exception.class) - public ResultBean update(SysOrganizationDto dto, String sid) { + public ResultBean update(SysOrganizationDto dto, String sid){ ResultBean rb = ResultBean.fireFail(); //查询该机构下的所有分管人员 List stringList = sysStaffOrgService.selectByOrgSid(sid); @@ -186,15 +192,17 @@ public class SysOrganizationRest{ return rb.success(); } - - public ResultBean del(String ids) { + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ ResultBean rb = ResultBean.fireFail(); sysOrganizationService.delByIds(ids); return rb.success(); } - - public ResultBean delBySid(String sid) { + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); if (StringUtils.isBlank(sid)) { return ResultBean.fireFail().setMessage("sid不能为空!"); @@ -204,15 +212,18 @@ public class SysOrganizationRest{ return rb.success(); } - - public ResultBean fetch(String id) { + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ ResultBean rb = ResultBean.fireFail(); SysOrganizationVo vo = sysOrganizationService.fetchByIdVo(id); return rb.success().setData(vo); } - - public ResultBean fetchBySid(String sid) { + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); SysOrganization entity = sysOrganizationService.fetchBySid(sid); List list = sysStaffOrgService.fetchByOrgSid(sid); @@ -247,8 +258,10 @@ public class SysOrganizationRest{ return rb.success().setData(vo); } - - public ResultBean> selectAppOrganization(String sid) { + @ApiOperation("手机获取组织架构") + @ResponseBody + @GetMapping("/selectAppOrganization") + public ResultBean> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid) { Map map = new HashMap<>(); List> nameList = sysOrganizationService.selectOrgNameList(sid); List staffList = new ArrayList<>(); @@ -267,48 +280,68 @@ public class SysOrganizationRest{ } - public ResultBean> selectListOrg() { + @ApiOperation("组织架构") + @ResponseBody + @GetMapping("/selectListOrg") + ResultBean> selectListOrg(){ ResultBean> rb = ResultBean.fireFail(); List menuTree2VoList = sysOrganizationService.treeList(); return rb.success().setData(menuTree2VoList); } - public ResultBean> getListOrg() { + @ApiOperation("获取到分公司") + @ResponseBody + @GetMapping("/getListOrg") + ResultBean> getListOrg(){ ResultBean> rb = ResultBean.fireFail(); List menuTree2VoList = sysOrganizationService.getListOrg(); return rb.success().setData(menuTree2VoList); } - - public ResultBean> getListOrgByBrand(String orgSid) { + @ApiOperation("获取同品牌下分公司") + @ResponseBody + @GetMapping("/getListOrgByBrand/{orgSid}") + ResultBean> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid){ return null;//sysOrganizationService.getListOrgByBrand(orgSid); } - - public ResultBean> getListOrgByBrandSid(String orgSid, String brandSid) { + @ApiOperation("获取指定品牌下分公司(已筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){ return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid); } - - public ResultBean> getListOrgByBrandSidNo(String orgSid, String brandSid) { + @ApiOperation("获取指定品牌下分公司(未筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){ return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid); } - - public ResultBean> getListDeptByOrgSid(String orgSid) { + @ApiOperation("获取指定分公司下部门信息") + @ResponseBody + @GetMapping("/getListDeptByOrgSid/{orgSid}") + ResultBean> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid){ return sysOrganizationService.getListDeptByOrgSid(orgSid); } - public ResultBean getUseOrgByUserSid(String userSid) { + @ApiOperation("根据业务员sid获取到分公司") + @ResponseBody + @GetMapping("/getUseOrgByUserSid") + ResultBean getUseOrgByUserSid(@RequestParam("userSid") String userSid){ ResultBean rb = ResultBean.fireFail(); SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid); return rb.success().setData(vo); } - public ResultBean selectBySid(String sid) { + @ApiOperation("根据部门sid查询组织信息") + @ResponseBody + @GetMapping("/selectBySid") + ResultBean selectBySid(@RequestParam("sid") String sid){ SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); if (sysOrganization == null) { return new ResultBean().fail().setData(new SysOrganization()); @@ -317,7 +350,10 @@ public class SysOrganizationRest{ } - public ResultBean>> selectUseOrgSidBySid(String sid) { + @ApiOperation("根据组织架构sid查询组织下所有分公司") + @ResponseBody + @GetMapping("/selectUseOrgSidBySid") + ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid){ ResultBean rb = ResultBean.fireFail(); List> maps = sysOrganizationService.selectUseOrgSidBySid(sid); return rb.success().setData(maps); @@ -328,8 +364,10 @@ public class SysOrganizationRest{ * * @return */ - - public ResultBean> selectListOne() { + @ApiOperation("所在部门下拉") + @ResponseBody + @GetMapping("/selectListOne") + ResultBean> selectListOne(){ ResultBean> rb = ResultBean.fireFail(); List sysOrgListVo = sysOrganizationService.selectTreeList(); if (sysOrgListVo.size() == 0) { @@ -340,8 +378,10 @@ public class SysOrganizationRest{ return rb.success().setData(sysOrgListVo); } - - public ResultBean getQrCode(String sid) { + @PostMapping("/getQrCode/{sid}") + @ResponseBody + @ApiOperation("查看二维码") + public ResultBean getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid) { SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); if (sysOrganization == null) { return new ResultBean().fail().setMsg("部门不存在"); @@ -371,7 +411,10 @@ public class SysOrganizationRest{ } - public ResultBean getOrgSid(String sid) { + @GetMapping("/getOrgSid/{sid}") + @ResponseBody + @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司") + ResultBean getOrgSid(@PathVariable(value = "sid") String sid){ ResultBean rb = ResultBean.fireFail(); SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); if (sysOrganization == null) { @@ -381,35 +424,51 @@ public class SysOrganizationRest{ return rb.success().setData(orgSid); } - - public ResultBean> selectOrgList(SysOrganizationListQuery query) { + @GetMapping("/selectOrgList") + @ResponseBody + @ApiOperation("当前分公司销售部门及部门人员") + ResultBean> selectOrgList(@SpringQueryMap SysOrganizationListQuery query){ return sysOrganizationService.selectOrgList(query); } - public ResultBean> selectOrgLists(SysOrganizationListQuery query) { + @GetMapping("/selectOrgLists") + @ResponseBody + @ApiOperation("当前分公司下所有部门") + ResultBean> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query){ return sysOrganizationService.selectOrgLists(query); } - public ResultBean selectByPSid(String sid, String name) { + @GetMapping("/selectByPSid") + @ResponseBody + @ApiOperation("查询分公司下的销售支持部") + ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name){ return sysOrganizationService.selectByPSid(sid,name); } - - public ResultBean> selectOrgSidList() { + @GetMapping("/selectOrgSidList") + @ResponseBody + @ApiOperation("所有分公司sid") + ResultBean> selectOrgSidList() { ResultBean> rb = ResultBean.fireFail(); List stringList = sysOrganizationService.selectOrgSidList(); return rb.success().setData(stringList); } - public ResultBean> selectOrgByPSid(String psid) { + @GetMapping("/selectOrgByPSid") + @ResponseBody + @ApiOperation("查询事业部下所有分公司") + ResultBean> selectOrgByPSid(@RequestParam("psid") String psid){ return sysOrganizationService.selectOrgByPSid(psid); } - public ResultBean selectByOrgSidPath(String orgSidPath) { + @GetMapping("/selectByOrgSidPath") + @ResponseBody + @ApiOperation("组织层级分页查询") + ResultBean selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath){ return sysOrganizationService.selectByOrgSidPath(orgSidPath); } } diff --git a/src/main/java/com/yxt/user/apiadmin/SysPostRest.java b/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java similarity index 64% rename from src/main/java/com/yxt/user/apiadmin/SysPostRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysPostRest.java index 3a8277c..01da8ca 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysPostRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java @@ -1,15 +1,13 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; -import com.yxt.user.biz.syspost.*; +import com.yxt.portal.biz.syspost.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.syspost.*; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; @@ -35,21 +33,25 @@ public class SysPostRest { @Autowired private SysPostService sysPostService; - + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); PagerVo pv = sysPostService.listPageVo(pq); return rb.success().setData(pv); } - - public ResultBean> listAll(@RequestBody SysPostQuery query) { + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysPostQuery query){ ResultBean rb = ResultBean.fireFail(); List list = sysPostService.listAllVo(query); return rb.success().setData(list); } + @ApiOperation("所有数据列表") + @GetMapping("/list") public ResultBean> list() { ResultBean rb = ResultBean.fireFail(); List list = sysPostService.listVo(); @@ -57,28 +59,35 @@ public class SysPostRest { } - public ResultBean save(SysPostDto dto) { + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysPostDto dto){ ResultBean rb = ResultBean.fireFail(); sysPostService.saveOrUpdateDto(dto); return rb.success(); } - public ResultBean update(SysPostDto dto, String sid) { + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); sysPostService.updateBySid(dto.toMap(), sid); return rb.success(); } - - public ResultBean del(String ids) { + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ ResultBean rb = ResultBean.fireFail(); sysPostService.delByIds(ids); return rb.success(); } - public ResultBean delBySids(String sids) { + @ApiOperation("删除记录") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids){ ResultBean rb = ResultBean.fireFail(); String[] sidArr = sids.split(","); sysPostService.delBySids(sidArr); @@ -86,39 +95,47 @@ public class SysPostRest { } - public ResultBean fetch(String id) { + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ ResultBean rb = ResultBean.fireFail(); SysPostVo vo = sysPostService.fetchByIdVo(id); return rb.success().setData(vo); } - public ResultBean fetchBySid(String sid) { + @ApiOperation("获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); SysPostVo vo = sysPostService.fetchBySidVo(sid); return rb.success().setData(vo); } - public ResultBean> fetchByOrgSid(String orgSid) { + @ApiOperation("根据部门sid获取岗位列表") + @GetMapping("/fetchByOrgSid/{orgSid}") + public ResultBean> fetchByOrgSid(@PathVariable("orgSid") String orgSid){ ResultBean rb = ResultBean.fireFail(); List list = sysPostService.fetchByOrgSid(orgSid); return rb.success().setData(list); } - - public ResultBean fetchByOrgSidPostCode() { + @ApiOperation("根据部门sid获取岗位编号") + @GetMapping("/fetchByOrgSidPostCode/{orgSid}") + public ResultBean fetchByOrgSidPostCode(){ ResultBean rb = ResultBean.fireFail(); String s = sysPostService.fetchByOrgSidPostCode(); return rb.success().setData(s); } /** - * 查询所有岗位 + * 查询岗位列表 * * @return */ - + @ApiOperation("查询岗位列表") + @GetMapping("/selectList") public ResultBean> selectList() { ResultBean> rb = ResultBean.fireFail(); List sysPostVoList = sysPostService.selectList(); diff --git a/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java similarity index 66% rename from src/main/java/com/yxt/user/apiadmin/SysRoleRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java index 61ab9f8..bd010e9 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysRoleRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysRoleRest.java @@ -1,15 +1,15 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysrole.*; +import com.yxt.portal.biz.sysrole.*; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,7 +34,8 @@ public class SysRoleRest { @Autowired private SysRoleService sysRoleService; - + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); PagerVo pv = sysRoleService.listPageVo(pq); @@ -42,6 +43,8 @@ public class SysRoleRest { } + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") public ResultBean> listAll(@RequestBody SysRoleQuery query){ ResultBean rb = ResultBean.fireFail(); List list = sysRoleService.listAllVo(query); @@ -49,14 +52,18 @@ public class SysRoleRest { } - public ResultBean> listAllByUserSid(String userSid) { + @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色") + @PostMapping("/listAllByUserSid/{userSid}") + public ResultBean> listAllByUserSid(@PathVariable("userSid") String userSid){ ResultBean rb = ResultBean.fireFail(); List list = sysRoleService.listAllByUserSid(userSid); return rb.success().setData(list); } - public ResultBean> fetchByUserSid(String userSid) { + @ApiOperation("根据用户sid查询用户的角色列表") + @PostMapping("/fetchByUserSid/{userSid}") + public ResultBean> fetchByUserSid(@PathVariable("userSid") String userSid){ if(StringUtils.isBlank(userSid)){ return new ResultBean>().fail().setMsg("userSid不能为空"); } @@ -73,7 +80,9 @@ public class SysRoleRest { } - public ResultBean save(SysRoleDto dto){ + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysRoleDto dto){ String name = dto.getName(); if(StringUtils.isBlank(name)){ return new ResultBean>().fail().setMsg("角色名称不能为空!"); @@ -87,9 +96,11 @@ public class SysRoleRest { sysRoleService.saveOrUpdateDto(dto); return rb.success(); } - - public ResultBean update(SysRoleDto dto,String sid){ + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid){ String roleName = dto.getName(); if(StringUtils.isBlank(sid)){ return new ResultBean>().fail().setMsg("角色sid不能为空!"); @@ -108,28 +119,33 @@ public class SysRoleRest { } - public ResultBean del(String ids){ + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ ResultBean rb = ResultBean.fireFail(); sysRoleService.delByIds(ids); return rb.success(); } - - public ResultBean delBySids(String sids) { + @ApiOperation("删除记录根据sids") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids){ ResultBean rb = ResultBean.fireFail(); sysRoleService.delBySids(sids); return rb.success(); } - - public ResultBean fetch(String id){ + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ ResultBean rb = ResultBean.fireFail(); SysRoleVo vo = sysRoleService.fetchByIdVo(id); return rb.success().setData(vo); } - - public ResultBean fetchBySid(String sid) { + @ApiOperation("获取一条记录根据sid") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); SysRoleVo vo = sysRoleService.fetchBySidVo(sid); if (StringUtils.isBlank(vo.getSid())) { @@ -138,8 +154,10 @@ public class SysRoleRest { return rb.success().setData(vo); } - - public ResultBean setIsEnable(String sid, String isEnable) { + @PostMapping("/setIsEnable/{sid}/{isEnable}") + @ResponseBody + @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用") + public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){ SysRole role = sysRoleService.fetchBySid(sid); if (role == null) { return ResultBean.fireFail().setMsg("此角色已不存在"); diff --git a/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java b/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java similarity index 95% rename from src/main/java/com/yxt/user/apiadmin/SysSourceRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java index 83d3e81..729ca19 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysSourceRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysSourceRest.java @@ -1,14 +1,14 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; //import com.yxt.user.biz.systemlog.SystemLog; -import com.yxt.user.biz.sysuser.SysUser; +import com.yxt.portal.biz.sysuser.SysUser; //import com.yxt.user.biz.systemlog.SystemLogService; -import com.yxt.user.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysuser.SysUserService; import com.yxt.common.base.config.RedisUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.syssource.*; +import com.yxt.portal.biz.syssource.*; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java similarity index 98% rename from src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java index 732b548..db22782 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysStaffOrgRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffOrgRest.java @@ -1,6 +1,6 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; -import com.yxt.user.biz.sysstafforg.*; +import com.yxt.portal.biz.sysstafforg.*; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffPostRest.java similarity index 91% rename from src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysStaffPostRest.java index 0e47c48..e2ea3c3 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysStaffPostRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffPostRest.java @@ -1,18 +1,18 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; -import com.yxt.user.biz.sysstaffpost.SysStaffPostDto; -import com.yxt.user.biz.sysstaffpost.SysStaffPostQuery; -import com.yxt.user.biz.sysstaffpost.SysStaffPostVo; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostDto; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostQuery; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostVo; //import com.yxt.user.biz.systemlog.SystemLog; -import com.yxt.user.biz.sysuser.SysUser; +import com.yxt.portal.biz.sysuser.SysUser; //import com.yxt.user.biz.systemlog.SystemLogService; -import com.yxt.user.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysuser.SysUserService; import com.yxt.common.base.config.RedisUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysstaffpost.SysStaffPostService; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostService; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java b/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java similarity index 96% rename from src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java index e9e4bdd..6feea80 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysStaffinfoRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysStaffinfoRest.java @@ -1,16 +1,16 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sysstaffinfo.*; -import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffQuery; -import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffVo; -import com.yxt.user.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysstaffinfo.*; +import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.portal.biz.sysuser.SysUserService; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; import io.swagger.annotations.Api; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserDefaultOrgRest.java similarity index 78% rename from src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysUserDefaultOrgRest.java index 6940d11..378c827 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysUserDefaultOrgRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserDefaultOrgRest.java @@ -1,9 +1,9 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import com.yxt.common.core.result.ResultBean; -import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgDto; -import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgService; -import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgVo; +import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgDto; +import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgService; +import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgVo; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java similarity index 71% rename from src/main/java/com/yxt/user/apiadmin/SysUserRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysUserRest.java index 6b4b4ab..c79d5b9 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysUserRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRest.java @@ -1,4 +1,4 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,25 +8,29 @@ import com.yxt.common.base.utils.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysorganization.SysOrganization; -import com.yxt.user.biz.sysorganization.SysOrganizationService; -import com.yxt.user.biz.syspost.SysPost; -import com.yxt.user.biz.syspost.SysPostService; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfo; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoVo; -import com.yxt.user.biz.sysstafforg.SysStaffOrg; -import com.yxt.user.biz.sysstafforg.SysStaffOrgService; -import com.yxt.user.biz.sysstaffpost.SysStaffPost; -import com.yxt.user.biz.sysstaffpost.SysStaffPostService; -import com.yxt.user.biz.sysuser.*; +import com.yxt.portal.biz.sysorganization.SysOrganization; +import com.yxt.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.portal.biz.syspost.SysPost; +import com.yxt.portal.biz.syspost.SysPostService; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoVo; +import com.yxt.portal.biz.sysstafforg.SysStaffOrg; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.portal.biz.sysstaffpost.SysStaffPost; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostService; +import com.yxt.portal.biz.sysuser.*; +import com.yxt.portal.biz.sysuser.app.OrgList; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import java.util.*; /** @@ -67,21 +71,24 @@ public class SysUserRest { // 定义点选文字图片验证码允许的误差值 private static final int ERROR_AMOUNT = 50;// 定义允许的误差值，单位是px - + @ApiOperation("根据条件分页查询数据的列表 ") + @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq) { ResultBean rb = ResultBean.fireFail();//roleSid PagerVo pv = sysUserService.listPageVo(pq); return rb.success().setData(pv); } - - public ResultBean> listAll(@RequestBody SysUserQuery query) { + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysUserQuery query){ ResultBean rb = ResultBean.fireFail(); List list = sysUserService.listAllVo(query); return rb.success().setData(list); } - + @ApiOperation("所有数据列表") + @GetMapping("/list") public ResultBean> list() { ResultBean rb = ResultBean.fireFail(); List list = sysUserService.listVo(); @@ -89,7 +96,9 @@ public class SysUserRest { } - public ResultBean save(SysUserDto dto) { + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysUserDto dto){ ResultBean rb = ResultBean.fireFail(); //手机号 String mobile = dto.getMobile(); @@ -168,9 +177,10 @@ public class SysUserRest { return rb.success(); } - - public ResultBean delSysUserByMobile(String mobile) { - int i = sysUserService.delSysUserByMobile(mobile); + @ApiOperation("根据staffSid删除用户（逻辑删除）") + @PostMapping("/delSysUserByMobile") + public ResultBean delSysUserByMobile(@RequestParam("sid") String sid){ + int i = sysUserService.delSysUserByMobile(sid); if (i == 0) { return new ResultBean().fail().setMsg("删除失败"); } @@ -178,14 +188,17 @@ public class SysUserRest { } - public ResultBean getSysUserByMobile(String staffSid) { + @ApiOperation("根据staffSid查询用户信息") + @PostMapping("/getSysUserByMobile") + public ResultBean getSysUserByMobile(@RequestParam("staffSid") String staffSid){ ResultBean rb = ResultBean.fireFail(); SysStaffinfoVo user = sysUserService.getSysUserByMobile(staffSid); return rb.success().setData(user); } - - public ResultBean update(SysUserDto dto, String sid) { + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysUserDto dto, @PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); sysUserService.updateBySid(dto.toMap(), sid); //部门sid @@ -229,10 +242,16 @@ public class SysUserRest { * @param original 原始密码 * @param password 密码 * @param confirmPassword 确认密码 + * @param userSid 用户sid * @return */ - - public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { + @PostMapping("/updatePassword") + @ApiOperation(value = "5、修改密码") + public ResultBean updatePassword(@RequestParam("original") String original, + @RequestParam("password") String password, + @RequestParam("confirmPassword") String confirmPassword, + @RequestParam("userSid") String userSid, + HttpServletRequest httpServletRequest){ String token = httpServletRequest.getHeader("token"); // 根据redisToken查询用户信息 SysUser user = sysUserService.fetchBySid(userSid); @@ -259,21 +278,27 @@ public class SysUserRest { } - public ResultBean del(String ids) { + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ ResultBean rb = ResultBean.fireFail(); sysUserService.delByIds(ids); return rb.success(); } - public ResultBean delBySid(String sid) { + @ApiOperation("删除记录根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); sysUserService.delBySid(sid); return rb.success(); } - public ResultBean selectByUserName(String mobile) { + @ApiOperation("根据用户名（手机号）查询用户") + @GetMapping("/fetchByMobile/{mobile}") + public ResultBean selectByUserName(@PathVariable("mobile") String mobile){ SysUser user = sysUserService.selectByUserName(mobile); SysUserVo sysUserVo = new SysUserVo(); BeanUtil.copyProperties(user, sysUserVo); @@ -281,33 +306,56 @@ public class SysUserRest { } - public ResultBean fetch(String id) { + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ ResultBean rb = ResultBean.fireFail(); SysUserVo vo = sysUserService.fetchByIdVo(id); return rb.success().setData(vo); } - - public ResultBean fetchBySid(String sid) { + @ApiOperation("根据sid获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); SysUserVo vo = sysUserService.fetchBySidVo(sid); return rb.success().setData(vo); } - - public ResultBean> fetchBySids(String sids) { + @ApiOperation("根据多个或者一个sid获取对应的用户集合") + @GetMapping("/fetchBySids/{sids}") + public ResultBean> fetchBySids(@PathVariable("sids") String sids){ ResultBean rb = ResultBean.fireFail(); List vo = sysUserService.fetchBySidSVo(sids); return rb.success().setData(vo); } - public ResultBean reGetPwd(String userName, String userPhone) { + /** + * 客户端找回密码 + * + * @param userName,userPhone + * @return + */ + @ApiOperation("客户端找回密码") + @PostMapping("/reGetPwd") + public ResultBean reGetPwd(@RequestParam("userName") String userName, @RequestParam("userPhone") String userPhone){ return sysUserService.reGetPwd(userName, userPhone); } - public ResultBean initPwd(String sid) { + /** + * 初始化密码 + * + * @param sid 用户sid + * @return ResultBean + */ + @ResponseBody + @PostMapping("/initPwd/{sid}") + @ApiOperation(value = "10、用户初始化密码") + @ApiOperationSupport(order = 100) + public ResultBean + initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) { if (!sysUserService.initPwd(sid)) { return ResultBean.fireFail().setMsg("初始化密码失败"); } @@ -476,7 +524,11 @@ public class SysUserRest { return new ResultBean().success().setData(userInfoOneVo); } - public ResultBean loginByNoVeriCode(SysUserQuery userQuery) { + @PostMapping("/loginByNoVeriCode") + @ResponseBody + @ApiOperation(value = "3、登录无验证码") + @ApiOperationSupport(order = 30) + public ResultBean loginByNoVeriCode(@RequestBody SysUserQuery userQuery) { String userName = userQuery.getUserName(); String password = userQuery.getPassword(); @@ -522,8 +574,16 @@ public class SysUserRest { } - - public ResultBean signOut(HttpServletRequest httpServletRequest) { + /** + * 退出登录 + * + * @return + */ + @PostMapping("/signOut") + @ResponseBody + @ApiOperation(value = "退出登录") + @ApiOperationSupport(order = 30) + public ResultBean signOut(HttpServletRequest httpServletRequest){ String token = httpServletRequest.getHeader("token"); String redisToken = redisUtil.get(token); if (StringUtils.isBlank(redisToken)) { @@ -543,7 +603,7 @@ public class SysUserRest { @ResponseBody @ApiOperation(value = "3、获取注册码") @ApiOperationSupport(order = 30) - public ResultBean sendMessageCode(String mobile) { + public ResultBean sendMessageCode(@RequestParam("mobile") String mobile) { if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { return new ResultBean().fail().setMsg("请输入正确的手机号"); } @@ -552,7 +612,7 @@ public class SysUserRest { } /** - * 获取登录注册码（） + * 获取登录码（） * @param mobile * @return */ @@ -560,15 +620,33 @@ public class SysUserRest { @ResponseBody @ApiOperation(value = "3、获取登录码") @ApiOperationSupport(order = 30) - public ResultBean sendMessageLogin(String mobile) { + public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile) { if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { return new ResultBean().fail().setMsg("请输入正确的手机号"); } String verificationCode = ""; return sysUserService.getVerificationCodeL(mobile, verificationCode); } - - public ResultBean selectByStaffsid(String staffsid) { + /** + * 获取修改码（） + * @param mobile + * @return + */ + @PostMapping("/sendMessageUpdate") + @ResponseBody + @ApiOperation(value = "3、获取修改码") + @ApiOperationSupport(order = 30) + public ResultBean sendMessageUpdate(@RequestParam("mobile") String mobile) { + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { + return new ResultBean().fail().setMsg("请输入正确的手机号"); + } + String verificationCode = ""; + return sysUserService.getVerificationCodeU(mobile, verificationCode); + } + @ApiOperation("根据staffsid查询用户") + @ResponseBody + @GetMapping("/selectByStaffsid/{staffsid}") + public ResultBean selectByStaffsid(@PathVariable("staffsid") String staffsid){ SysUserVo user = sysUserService.selectByStaffsid(staffsid); if (user != null) { return new ResultBean().success().setData(user); @@ -579,7 +657,9 @@ public class SysUserRest { } - public ResultBean selectBySid(String sid) { + @ApiOperation("根据sid查询用户信息") + @PostMapping("/selectBySid") + public ResultBean selectBySid(@RequestParam("sid") String sid){ ResultBean rb = ResultBean.fireFail(); SysUser vo = sysUserService.fetchBySid(sid); if (vo == null) { @@ -627,7 +707,10 @@ public class SysUserRest { * @return */ - public ResultBean selectUserInfoByUserSid(String userSid) { + @ApiOperation(value = "根据用户的sid查询用户的组织信息") + @ResponseBody + @GetMapping("/selectUserInfoByUserSid/{userSid}") + public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid){ ResultBean rb = ResultBean.fireFail(); SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid); if (sysUserInfoVo == null) { @@ -637,7 +720,10 @@ public class SysUserRest { } - public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) { + @ApiOperation(value = "根据用户的sid查询用户的组织信息") + @ResponseBody + @GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}") + public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid, @PathVariable("orgSid") String orgSid){ ResultBean rb = ResultBean.fireFail(); SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid, orgSid); if (sysUserInfoVo == null) { @@ -647,7 +733,10 @@ public class SysUserRest { } - public ResultBean setIsEnable(String sid, String isEnable) { + @PostMapping("/setIsEnable/{sid}/{isEnable}") + @ResponseBody + @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用") + public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){ SysUser sysUser = sysUserService.fetchBySid(sid); if (sysUser == null) { return ResultBean.fireFail().setMsg("此角色已不存在"); @@ -660,82 +749,129 @@ public class SysUserRest { } - public ResultBean getUsersByRoleSid(String roleSid) { + @ApiOperation("根据角色sid查询用户") + @GetMapping("/getUsersByRoleSid/{roleSid}") + ResultBean getUsersByRoleSid(@PathVariable("roleSid") String roleSid) { return sysUserService.getUsersByRoleSid(roleSid); } - public ResultBean> getUserByRole(UserQuery query) { + @ApiOperation(value = "获取本机构链角色的用户") + @GetMapping(value = "getUserByRole") + ResultBean> getUserByRole(@SpringQueryMap UserQuery query) { return sysUserService.getUserByRole(query); } - public ResultBean> getUserSidByRole(UserQuery query) { + @ApiOperation(value = "获取本机构链角色的用户sid") + @GetMapping(value = "getUserSidByRole") + ResultBean> getUserSidByRole(@SpringQueryMap UserQuery query) { return sysUserService.getUserSidByRole(query); } - public ResultBean> getUsersByRoles(UserssQuery usersQuery) { + @ApiOperation(value = "获取本机构链角色的用户") + @PostMapping(value = "getUsersByRoles") + ResultBean> getUsersByRoles(@RequestBody UserssQuery usersQuery) { return sysUserService.getUsersByRoles(usersQuery); } - - public ResultBean> getUserByOrgRole(UserRoleQuery query) { + /** + * 参数：当前用户角色sid，部门sid + * + * @param query + * @return + */ + @ApiOperation(value = "获取本部门直属上级角色的用户") + @GetMapping(value = "getUserByOrgRole") + ResultBean> getUserByOrgRole(@SpringQueryMap UserRoleQuery query) { return sysUserService.getUserByOrgRole(query); } - public ResultBean> getOtherOrgRoleUser(UserRoleQuery query) { + /** + * 参数为下一环节角色sid，机构sid + * + * @param query + * @return + */ + @ApiOperation(value = "获取其他机构链角色的用户") + @GetMapping(value = "getOtherOrgRoleUser") + ResultBean> getOtherOrgRoleUser(@SpringQueryMap UserRoleQuery query) { return sysUserService.getOtherOrgRoleUser(query); } - public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { + @ApiOperation(value = "获取当前分公司下所有员工的userSid和员工姓名") + @GetMapping(value = "getUserByOrgSid") + ResultBean>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid){ return sysUserService.getUserByOrgSid(orgSid, userSid); } - - public ResultBean selectIdBySid(List stringList) { + @ApiOperation(value = "根据用户sid获取用户id") + @PostMapping(value = "selectIdBySid") + ResultBean selectIdBySid(@RequestBody List stringList) { return sysUserService.selectIdBySid(stringList); } - public ResultBean> selectSysUserList(String userSid, String orgPath) { + @ApiOperation(value = "根据用户sid查询该分公司下所有销售经理的用户") + @GetMapping(value = "selectSysUserList") + ResultBean> selectSysUserList(@RequestParam("userSid") String userSid, @RequestParam(value = "orgPath", required = false) String orgPath){ return sysUserService.selectSysUserList(userSid, orgPath); } - public ResultBean selectPasswordByUserSid(String userSid) { + @ApiOperation(value = "查询是否需要更换密码") + @GetMapping(value = "/selectPasswordByUserSid/{userSid}") + ResultBean selectPasswordByUserSid(@PathVariable("userSid") String userSid){ return sysUserService.selectPasswordByUserSid(userSid); } - public ResultBean selectHaveMessage(SysHaveMessageQuery sysHaveMessageQuery) { + /** + * 查询该菜单是否允许创建，是否有提醒消息 + * + * @return + */ + @ApiOperation(value = "查询该菜单是否允许创建，是否有提醒消息") + @PostMapping(value = "/selectHaveMessage") + ResultBean selectHaveMessage(@RequestBody SysHaveMessageQuery sysHaveMessageQuery){ return sysUserService.selectHaveMessage(sysHaveMessageQuery); } -// public ResultBean> getOrgListByUserSid(String userSid) { -// return sysUserService.getOrgListByUserSid(userSid); -// } + @ApiOperation(value = "根据用户sid获取当前用户所有的组织机构list") + @GetMapping(value = "/getOrgListByUserSid") + ResultBean> getOrgListByUserSid(@RequestParam("userSid") String userSid) { + return sysUserService.getOrgListByUserSid(userSid); + } - public ResultBean> getUserByRoles(UserByRolesAndOrgQuery userQuery) { + @ApiOperation(value = "根据多个角色sid以及机构sid获取本机构链角色的用户") + @PostMapping(value = "/getUserByRoles") + ResultBean> getUserByRoles(@RequestBody UserByRolesAndOrgQuery userQuery) { return sysUserService.getUserByRoles(userQuery); } - public ResultBean> shareSelectUser(ShareUserQuery shareUserQuery) { + @ApiOperation(value = "分享时查询的人员") + @PostMapping(value = "/shareSelectUser") + ResultBean> shareSelectUser(@RequestBody ShareUserQuery shareUserQuery){ return sysUserService.shareSelectUser(shareUserQuery); } - public ResultBean selectPrivilegeLevel(PrivilegeQuery query) { + @ApiOperation(value = "查询角色权限的层级获取权限id") + @PostMapping(value = "/selectPrivilegeLevel") + ResultBean selectPrivilegeLevel(@RequestBody PrivilegeQuery query) { return sysUserService.selectPrivilegeLevel(query); } - public ResultBean removeRedis() { + @ApiOperation(value = "清除所有离职人员的移动端登录缓存") + @PostMapping(value = "/removeRedis") + ResultBean removeRedis() { return sysUserService.removeRedis(); } } diff --git a/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java b/src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java similarity index 61% rename from src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java rename to src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java index c1d5413..b0131c0 100644 --- a/src/main/java/com/yxt/user/apiadmin/SysUserRoleRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysUserRoleRest.java @@ -1,15 +1,14 @@ -package com.yxt.user.apiadmin; +package com.yxt.portal.apiadmin; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysuserrole.*; +import com.yxt.portal.biz.sysuserrole.*; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -34,36 +33,41 @@ public class SysUserRoleRest { @Autowired private SysUserRoleService sysUserRoleService; - + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); PagerVo pv = sysUserRoleService.listPageVo(pq); return rb.success().setData(pv); } - + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") public ResultBean> listAll(@RequestBody SysUserRoleQuery query){ ResultBean rb = ResultBean.fireFail(); List list = sysUserRoleService.listAllVo(query); return rb.success().setData(list); } - + @ApiOperation("所有数据列表") + @GetMapping("/list") public ResultBean> list(){ ResultBean rb = ResultBean.fireFail(); List list = sysUserRoleService.listVo(); return rb.success().setData(list); } - - public ResultBean save(SysUserRoleDto dto){ + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysUserRoleDto dto){ ResultBean rb = ResultBean.fireFail(); sysUserRoleService.saveOrUpdateDto(dto); return rb.success(); } - - public ResultBean update(SysUserRoleDto dto){ + @ApiOperation("修改保存") + @PostMapping("/update") + public ResultBean update(@RequestBody SysUserRoleDto dto){ ResultBean rb = ResultBean.fireFail(); sysUserRoleService.deleteByUserSid(dto.getUserSid()); String roleSid = dto.getRoleSid(); @@ -80,39 +84,46 @@ public class SysUserRoleRest { return rb.success(); } - - public ResultBean del(String ids){ + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ ResultBean rb = ResultBean.fireFail(); sysUserRoleService.delByIds(ids); return rb.success(); } - - public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) { + @ApiOperation("根据用户sid和角色sid删除记录") + @GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}") + public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid, + @PathVariable("roleSid")String roleSid) { ResultBean rb = ResultBean.fireFail(); sysUserRoleService.delByUserSidAndRoleSid(userSid,roleSid); return rb.success(); } - - public ResultBean fetch(String id){ + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ ResultBean rb = ResultBean.fireFail(); SysUserRoleVo vo = sysUserRoleService.fetchByIdVo(id); return rb.success().setData(vo); } - - public ResultBean> getUserRoleSidByUserSid(String userSid) { + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid) { return sysUserRoleService.getUserRoleSidByUserSid(userSid); } - - public ResultBean> getUserIdListByRoleSid(List roleList) { + @ApiOperation("根据角色sid查询用户id列表") + @GetMapping("/getUserIdListByRoleSid") + public ResultBean> getUserIdListByRoleSid(@RequestParam("roleList") List roleList) { return sysUserRoleService.getUserIdListByRoleSid(roleList); } - - public ResultBean> selectByUserSid(String userSid) { + @ApiOperation("查询用户的角色") + @GetMapping("/selectByUserSid") + ResultBean> selectByUserSid(@RequestParam("userSid") String userSid) { return sysUserRoleService.selectByUserSids(userSid); } } diff --git a/src/main/java/com/yxt/user/apiwx/WxHomeRest.java b/src/main/java/com/yxt/portal/apiwx/WxHomeRest.java similarity index 88% rename from src/main/java/com/yxt/user/apiwx/WxHomeRest.java rename to src/main/java/com/yxt/portal/apiwx/WxHomeRest.java index 9dbbfde..9c73c03 100644 --- a/src/main/java/com/yxt/user/apiwx/WxHomeRest.java +++ b/src/main/java/com/yxt/portal/apiwx/WxHomeRest.java @@ -1,4 +1,4 @@ -package com.yxt.user.apiwx; +package com.yxt.portal.apiwx; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java new file mode 100644 index 0000000..8c66e73 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommon.java @@ -0,0 +1,25 @@ +package com.yxt.portal.biz.dictcommon; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/6/23 15:40 + * @description 数据字典数据项 + */ +@Data +public class DictCommon extends BaseEntity { + private static final long serialVersionUID = 8921237815183601526L; + @ApiModelProperty(value = "数据项值") + private String dictKey; + @ApiModelProperty(value = "数据类型") + private String dictType; + @ApiModelProperty(value = "数据项相对应的value值") + private String dictValue; + @ApiModelProperty(value = "数据项的父级sid") + private String parentSid; + @ApiModelProperty(value = "分组名称") + private String groupName; +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java new file mode 100644 index 0000000..401258e --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonDto.java @@ -0,0 +1,36 @@ +package com.yxt.portal.biz.dictcommon; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author dimengzhe + * @date 2021/6/23 15:41 + * @description 数据字典数据项参数 + */ +@Data +public class DictCommonDto implements Dto { + private static final long serialVersionUID = 9102264215113210976L; + + @ApiModelProperty(value = "数据项值", required = true) + @NotBlank(message = "数据项值不能为空") + private String dictKey; + + @ApiModelProperty(value = "数据类型", required = true) + @NotBlank(message = "数据类型不能为空") + private String dictType; + + @ApiModelProperty(value = "数据项相对应的value值", required = true) + @NotBlank(message = "数据项相对应的value值不能为空") + private String dictValue; + + @ApiModelProperty(value = "数据项的父级sid", required = true) + @NotBlank(message = "数据项的父级sid不能为空") + private String parentSid; + + @ApiModelProperty(value = "分组名称", required = true) + private String groupName; +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java new file mode 100644 index 0000000..fc738da --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeign.java @@ -0,0 +1,65 @@ +package com.yxt.portal.biz.dictcommon; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/7/5 21:59 + * @description + */ +@FeignClient( + contextId = "anrui-portal-DictCommon", + name = "anrui-portal", + path = "v1/dictcommons", + fallback = DictCommonFeignFallback.class) +public interface DictCommonFeign { + + @PostMapping(value = "/save") + @ResponseBody + @ApiOperation(value = "数据字典数据项保存") + ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto); + + @PostMapping("/pageList") + @ResponseBody + @ApiOperation(value = "数据字典数据项分页列表") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery); + + @PostMapping("/update/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典修改后保存") + ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid); + + @ResponseBody + @DeleteMapping("/delete/{sid}") + @ApiOperation(value = "删除") + ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid); + + @ResponseBody + @GetMapping("/selectBykey/{key}/{type}") + @ApiOperation(value = "数据字典信息修改时的初始化信息") + public ResultBean selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type); + + @GetMapping("/typeValues") + @ResponseBody + @ApiOperation("下拉框的获取") + ResultBean> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid); + + @GetMapping("/getFirstDictKeyByType") + @ResponseBody + @ApiOperation("根据数据字典的key获取第一个值（默认值）") + ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid); + + @GetMapping("/getTypeValueList") + @ResponseBody + @ApiOperation("根据分类编码和数据分组查询数据字典") + ResultBean> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum); +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java new file mode 100644 index 0000000..e5a7aa7 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonFeignFallback.java @@ -0,0 +1,57 @@ +package com.yxt.portal.biz.dictcommon; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/7/5 22:00 + * @description + */ +@Component +public class DictCommonFeignFallback implements DictCommonFeign { + @Override + public ResultBean save(DictCommonDto dictCommonDto) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean> pageList(PagerQuery pagerQuery) { + return new ResultBean>().fail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean update(DictCommonDto dictCommonDto, String sid) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean delete(String sid) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + + @Override + public ResultBean selectBykey(String key, String type) { + return null; + } + + @Override + public ResultBean> getTypeValues(String type, String psid) { + return null; + } + + @Override + public ResultBean getFirstDictKeyByType(String dictType, String psid) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean> getTypeValueList(String type, String groupNum) { + return null; + } +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java new file mode 100644 index 0000000..c6e84ae --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.java @@ -0,0 +1,60 @@ +package com.yxt.portal.biz.dictcommon; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/6/23 15:07 + * @description + */ +@Mapper +public interface DictCommonMapper extends BaseMapper { + /** + * 根据数据项的key值和分类类型code值查询数量 + * + * @param dictKey 数据项key值 + * @param dictType 类型code值 + * @param parentSid 父级sid，无父级的此字段为0 + * @return + */ + DictCommon selectSize(@Param("dictkey") String dictKey, @Param("dictType") String dictType, @Param("parentSid") String parentSid); + + + /** + * 根据类型查询数据项 + * + * @param dictTypeCode 数据分类的类型 + * @return + */ + List selectByType(String dictTypeCode); + + + IPage pageList( + IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + DictCommonVo selectBykey(@Param("key") String key, @Param("type") String sid); + + /** + * 根据类型和父级sid查询数据字典 + * + * @param qw 查询条件 + * @return + */ + List getValue(@Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 根据数据字典编码类别和分组查询数据字典 + * @param type 数据字典编码类别 + * @param groupNum 数据字典分组 + * @return + */ + List getList(@Param("type") String type, @Param("groupNum") String groupNum); +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml new file mode 100644 index 0000000..c676e4c --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonQuery.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonQuery.java new file mode 100644 index 0000000..e8db6f2 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonQuery.java @@ -0,0 +1,24 @@ +package com.yxt.portal.biz.dictcommon; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/6/28 10:39 + * @description + */ +@Data +public class DictCommonQuery implements Query { + private static final long serialVersionUID = -787372981183812826L; + + @ApiModelProperty(value = "数据字典条目key", required = false) + private String dictKey; + + @ApiModelProperty(value = "数据字典文本", required = false) + private String dictValue; + + @ApiModelProperty(value ="dictType") + private String dictType; +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java new file mode 100644 index 0000000..abd5059 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java @@ -0,0 +1,77 @@ +package com.yxt.portal.biz.dictcommon; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/6/23 15:06 + * @description + */ +@Service +public class DictCommonService extends MybatisBaseService { + + public DictCommon selectSize(String dictKey, String dictType, String parentSid) { + return baseMapper.selectSize(dictKey, dictType, parentSid); + } + + public List selectByType(String dictTypeCode) { + return baseMapper.selectByType(dictTypeCode); + } + + public IPage pageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + DictCommonQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String dictKey = params.getDictKey(); + String dictValue = params.getDictValue(); + if (StringUtils.isNotBlank(dictValue)) { + qw.like("dc.dictValue", dictValue); + } + if (StringUtils.isNotBlank(dictKey)) { + qw.like("dc.dictKey", dictKey); + } + if (StringUtils.isNotBlank(params.getDictType())) { + qw.eq("dc.dictType", params.getDictType()); + } + } + qw.orderByDesc("dc.createTime"); + return baseMapper.pageList(page, qw); + } + + /** + * 根据类型和父级sid查询数据字典 + * + * @param dictCommonTypeQuery 查询条件 + * @return + */ + public List getValue(DictCommonTypeQuery dictCommonTypeQuery) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(dictCommonTypeQuery.getType())) {//类型 + qw.eq("dc.dictType", dictCommonTypeQuery.getType()); + } + if (StringUtils.isNotBlank(dictCommonTypeQuery.getPsid())) {//父级sid + qw.eq("dc.parentSid", dictCommonTypeQuery.getPsid()); + } + return baseMapper.getValue(qw); + } + + public DictCommonVo selectBykey(String key, String type) { + return baseMapper.selectBykey(key, type); + } + + public ResultBean> getList(String type, String groupNum) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.getList(type,groupNum); + return rb.success().setData(list); + } +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonTypeQuery.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonTypeQuery.java new file mode 100644 index 0000000..40aed83 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonTypeQuery.java @@ -0,0 +1,21 @@ +package com.yxt.portal.biz.dictcommon; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/9/30 15:33 + * @description 下拉框条件 + */ +@Data +public class DictCommonTypeQuery implements Query { + private static final long serialVersionUID = 139959085226402464L; + + @ApiModelProperty(value = "数据字典类型", required = true) + private String type; + + @ApiModelProperty(value = "psid", required = false,example = "0") + private String psid; +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonVo.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonVo.java new file mode 100644 index 0000000..09a4c16 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonVo.java @@ -0,0 +1,32 @@ +package com.yxt.portal.biz.dictcommon; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/6/23 15:54 + * @description + */ +@Data +public class DictCommonVo implements Vo { + private static final long serialVersionUID = -1094142938193916816L; + + @ApiModelProperty(value = "数据字典项sid") + private String sid; + + @ApiModelProperty(value = "数据字典项key") + private String dictKey; + + @ApiModelProperty(value = "数据字典类型") + private String dictType; + + @ApiModelProperty(value = "数据字典项名称") + private String dictValue; + @ApiModelProperty(value = "父级sid：0为第一级") + private String parentSid; + + @ApiModelProperty(value = "分组名称") + private String groupName; +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictType.java b/src/main/java/com/yxt/portal/biz/dicttype/DictType.java new file mode 100644 index 0000000..f425819 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictType.java @@ -0,0 +1,21 @@ +package com.yxt.portal.biz.dicttype; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/7/5 22:29 + * @description + */ +@Data +public class DictType extends BaseEntity { + + private static final long serialVersionUID = -2790449398289680139L; + + @ApiModelProperty(value = "类型代码") + private String dictTypeCode; + @ApiModelProperty(value = "类型名称") + private String dictTypeName; +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeDto.java b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeDto.java new file mode 100644 index 0000000..1702fb1 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeDto.java @@ -0,0 +1,30 @@ +package com.yxt.portal.biz.dicttype; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author dimengzhe + * @date 2021/6/23 15:20 + * @description 数据字典类型参数 + */ +@Data +public class DictTypeDto implements Dto { + private static final long serialVersionUID = -2302005624272862359L; + + @ApiModelProperty(value = "类型代码", required = true) + @NotBlank(message = "类型代码不能为空") + private String dictTypeCode; + + @ApiModelProperty(value = "类型名称", required = true) + @NotBlank(message = "类型名称不能为空") + private String dictTypeName; + + @ApiModelProperty(value = "类型说明", required = false) + private String remarks; + + +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeign.java b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeign.java new file mode 100644 index 0000000..ec5e236 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeign.java @@ -0,0 +1,46 @@ +package com.yxt.portal.biz.dicttype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @author dimengzhe + * @date 2021/6/23 15:21 + * @description 数据字典类型对外接口 + */ +@FeignClient( + contextId = "yxt-anrui-portal-DictType", + name = "yxt-anrui-portal", + path = "v1/dicttypes", + fallback = DictTypeFeignFallback.class) +public interface DictTypeFeign { + + @PostMapping(value = "/save") + @ResponseBody + @ApiOperation(value = "数据字典类型保存") + ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto); + + @PostMapping("/pageList") + @ResponseBody + @ApiOperation(value = "数据字典类型分页列表") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery); + + @PostMapping("/update/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典类型更新") + ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid); + + @DeleteMapping("/delete/{sid}") + @ResponseBody + @ApiOperation(value = "数据字典类型删除") + ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeignFallback.java b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeignFallback.java new file mode 100644 index 0000000..4f0166b --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeFeignFallback.java @@ -0,0 +1,34 @@ +package com.yxt.portal.biz.dicttype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + +/** + * @author dimengzhe + * @date 2021/7/5 22:32 + * @description + */ + +public class DictTypeFeignFallback implements DictTypeFeign{ + + @Override + public ResultBean save(DictTypeDto dictTypeDto) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean> pageList(PagerQuery pagerQuery) { + return new ResultBean>().fail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean update(DictTypeDto dictTypeDto, String sid) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean delete(String sid) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.java b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.java new file mode 100644 index 0000000..4679efb --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.java @@ -0,0 +1,28 @@ +package com.yxt.portal.biz.dicttype; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author dimengzhe + * @date 2021/6/23 14:56 + * @description + */ +@Mapper +public interface DictTypeMapper extends BaseMapper { + + /** + * 查询该类型代码存在的数量 + * + * @param dictTypeCode 类型代码 + * @return + */ + int selectSize(String dictTypeCode); + + IPage pageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.xml b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.xml new file mode 100644 index 0000000..33cec68 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeQuery.java b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeQuery.java new file mode 100644 index 0000000..51b144b --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeQuery.java @@ -0,0 +1,24 @@ +package com.yxt.portal.biz.dicttype; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/6/28 9:17 + * @description + */ +@Data +public class DictTypeQuery implements Query { + private static final long serialVersionUID = -1033205660448956012L; + + @ApiModelProperty(value = "数据字典code", required = false) + private String dictTypeCode; + + @ApiModelProperty(value = "数据分类名称", required = false) + private String dictTypeName; + + @ApiModelProperty(value = "说明", required = false) + private String remarks; +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeService.java b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeService.java new file mode 100644 index 0000000..091ff20 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeService.java @@ -0,0 +1,50 @@ +package com.yxt.portal.biz.dicttype; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import org.springframework.stereotype.Service; + +/** + * @author dimengzhe + * @date 2021/6/23 14:55 + * @description 数据字典类型实现类 + */ +@Service +public class DictTypeService extends MybatisBaseService { + + /** + * 根据此类型代码存在的数量 + * + * @param dictTypeCode 类型代码 + * @return 存在此类型代码的数量 + */ + + public int selectSize(String dictTypeCode) { + return baseMapper.selectSize(dictTypeCode); + } + + public IPage pageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + DictTypeQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + String dictTypeCode = params.getDictTypeCode(); + if (StringUtils.isNotBlank(dictTypeCode)) { + qw.like("dt.dictTypeCode", dictTypeCode); + } + String dictTypeName = params.getDictTypeName(); + if (StringUtils.isNotBlank(dictTypeName)) { + qw.like("dt.dictTypeName", dictTypeName); + } + if (StringUtils.isNotBlank(params.getRemarks())) { + qw.like("dt.remarks", params.getRemarks()); + } + } + qw.orderByDesc("dt.createTime"); + return baseMapper.pageList(page, qw); + } +} diff --git a/src/main/java/com/yxt/portal/biz/dicttype/DictTypeVo.java b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeVo.java new file mode 100644 index 0000000..4950087 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/dicttype/DictTypeVo.java @@ -0,0 +1,32 @@ +package com.yxt.portal.biz.dicttype; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/6/23 15:18 + * @description 数据字典类型返回数据 + */ +@Data +public class DictTypeVo implements Vo { + private static final long serialVersionUID = 9052935182700117654L; + + @ApiModelProperty(value = "数据类型sid") + private String sid; + + @ApiModelProperty(value = "类型代码") + private String dictTypeCode; + + @ApiModelProperty(value = "类型名称") + private String dictTypeName; + + @ApiModelProperty(value = "说明") + private String remarks; + + @ApiModelProperty(value = "分组名称") + private String groupName; + + +} diff --git a/src/main/java/com/yxt/user/biz/package-info.java b/src/main/java/com/yxt/portal/biz/package-info.java similarity index 69% rename from src/main/java/com/yxt/user/biz/package-info.java rename to src/main/java/com/yxt/portal/biz/package-info.java index 1c86e6a..6912364 100644 --- a/src/main/java/com/yxt/user/biz/package-info.java +++ b/src/main/java/com/yxt/portal/biz/package-info.java @@ -1,4 +1,4 @@ /** * 宇信通 仓库管理 项目后台逻辑和接口 */ -package com.yxt.user.biz; \ No newline at end of file +package com.yxt.portal.biz; \ No newline at end of file diff --git a/src/main/java/com/yxt/user/biz/sms/SmsDto.java b/src/main/java/com/yxt/portal/biz/sms/SmsDto.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sms/SmsDto.java rename to src/main/java/com/yxt/portal/biz/sms/SmsDto.java index 79ffa54..44e18ba 100644 --- a/src/main/java/com/yxt/user/biz/sms/SmsDto.java +++ b/src/main/java/com/yxt/portal/biz/sms/SmsDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sms; +package com.yxt.portal.biz.sms; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sms/SmsFeign.java b/src/main/java/com/yxt/portal/biz/sms/SmsFeign.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sms/SmsFeign.java rename to src/main/java/com/yxt/portal/biz/sms/SmsFeign.java index 1e66649..07d2d0f 100644 --- a/src/main/java/com/yxt/user/biz/sms/SmsFeign.java +++ b/src/main/java/com/yxt/portal/biz/sms/SmsFeign.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sms; +package com.yxt.portal.biz.sms; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; diff --git a/src/main/java/com/yxt/user/biz/sms/SmsFeignFallback.java b/src/main/java/com/yxt/portal/biz/sms/SmsFeignFallback.java similarity index 88% rename from src/main/java/com/yxt/user/biz/sms/SmsFeignFallback.java rename to src/main/java/com/yxt/portal/biz/sms/SmsFeignFallback.java index 86a272b..13b4e69 100644 --- a/src/main/java/com/yxt/user/biz/sms/SmsFeignFallback.java +++ b/src/main/java/com/yxt/portal/biz/sms/SmsFeignFallback.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sms; +package com.yxt.portal.biz.sms; import com.yxt.common.core.result.ResultBean; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionQuery.java b/src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionQuery.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionQuery.java rename to src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionQuery.java index 5583628..487ab59 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionVo.java b/src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionVo.java similarity index 88% rename from src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionVo.java rename to src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionVo.java index f1c7229..07b7150 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/ButtonPermissionVo.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/ButtonPermissionVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunction.java b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunction.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunction.java rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunction.java index 5cb8e90..c3a49e7 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunction.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunction.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionDto.java b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionDto.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunctionDto.java rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionDto.java index b0f0dc8..655e5f4 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionDto.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.java b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.java rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.java index 4cac2ff..02123e1 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.xml b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.xml similarity index 86% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.xml rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.xml index 558eb3a..8ff500b 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM sys_function @@ -11,7 +11,7 @@ - SELECT func.*, source.sourceName as sourceName FROM sys_function func left join sys_source_function sourceF on sourceF.functionSid = func.sid @@ -20,14 +20,14 @@ ${ew.sqlSegment} - SELECT DISTINCT func.*, ISNULL(roleFunction.sid) AS checked FROM sys_function func left join sys_role_function roleFunction on func.sid = roleFunction.functionSid and roleFunction.roleSid = #{param1} where func.parentSid = #{param2} - SELECT func.*, source.sourceName, sourceFunction.functionRootSid as functionRootSid FROM sys_function func left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid @@ -37,7 +37,7 @@ - SELECT func.*, source.sourceName, sourceFunction.functionRootSid as functionRootSid FROM sys_function func left join sys_source_function sourceFunction on sourceFunction.functionSid = func.sid @@ -60,7 +60,7 @@ where sf.isEnable = #{isEnable} and ssf.sourceSid = #{sourceSid} - SELECT sf.cId AS buttonId FROM sys_function sf WHERE actionUrl = #{query.url} diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionQuery.java b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionQuery.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunctionQuery.java rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionQuery.java index 819f183..d7ab88b 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionService.java b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionService.java similarity index 99% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunctionService.java rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionService.java index 2d4eb49..71178e3 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionService.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionService.java @@ -1,9 +1,9 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.syssource.SysSourceService; +import com.yxt.portal.biz.syssource.SysSourceService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionTreeVo.java b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionTreeVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunctionTreeVo.java rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionTreeVo.java index 6abe445..ac939f0 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionTreeVo.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionTreeVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionVo.java b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysfunction/SysFunctionVo.java rename to src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionVo.java index 388c901..8c9ee90 100644 --- a/src/main/java/com/yxt/user/biz/sysfunction/SysFunctionVo.java +++ b/src/main/java/com/yxt/portal/biz/sysfunction/SysFunctionVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysfunction; +package com.yxt.portal.biz.sysfunction; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenu.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenu.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java index 37e394f..09b219c 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenu.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenu.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuDto.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuDto.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java index 242b9ed..c897b1c 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuDto.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuFunctionQuery.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuFunctionQuery.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuFunctionQuery.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuFunctionQuery.java index 14488cc..48e9213 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuFunctionQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuFunctionQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java index e0e1aee..308cf00 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.xml b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml similarity index 81% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.xml rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml index e6f5d8b..812338d 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml @@ -1,16 +1,16 @@ - + - SELECT * FROM sys_menu ${ew.sqlSegment} - SELECT menu.*, source.sourceName, pmenu.name as pName FROM sys_menu menu left join sys_menu pmenu on pmenu.sid = menu.psid @@ -20,7 +20,7 @@ ${ew.sqlSegment} - SELECT menu.*, ISNULL(menuRole.sid) as checked FROM sys_menu menu left join sys_menu_role menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1} @@ -29,7 +29,7 @@ and menu.sourceSid = #{sourceSid} - SELECT menu.*, source.sourceName, sourceMenu.menuRootSid as menuRootSid FROM sys_menu menu left join sys_source_menu sourceMenu on sourceMenu.menuSid = menu.sid @@ -45,7 +45,7 @@ where sourceSid = #{sid} - SELECT menu.*, source.sourceName, menu.pSid as menuRootSid FROM sys_menu menu left join sys_source source on source.sid = menu.sourceSid @@ -60,11 +60,11 @@ and sourceSid = #{sourceSid} - select * from sys_menu where menuUrl = #{menuUrl} - SELECT menu.NAME AS NAME, menu.sid AS sid, menu.sid AS sid, diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuQuery.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuQuery.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuQuery.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuQuery.java index 9f69aeb..ce831cf 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuService.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java similarity index 70% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuService.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java index f40b5ba..f4957e5 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuService.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java @@ -1,10 +1,10 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sysmenu.*; -import com.yxt.user.biz.syssource.SysSourceService; +import com.yxt.portal.biz.sysmenurole.SysMenuRoleVo; +import com.yxt.portal.biz.syssource.SysSourceService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -280,25 +280,25 @@ public class SysMenuService extends MybatisBaseService { * * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单） */ -// public List> getSourceMenuTree(List list_menu, Map map_selectMenus) { -// -// //获取当前资源的菜单列表 -// List> list_menus_map = new ArrayList>(); -// -// -// //获取资源第一级菜单列表 -// List list_firstLevel_menu = list_menu.stream().filter(s -> s.getPSid().equals("0")).collect(Collectors.toList()); -// -// //遍历资源的第一级菜单 -// for (int i = 0; i < list_firstLevel_menu.size(); i++) { -// Map map_firstLevel_menu = getMenuTreeFromStream(list_firstLevel_menu.get(i).getSid(), list_menu, map_selectMenus); -// //把该菜单挂在当前菜单列表中 -// if (null != map_firstLevel_menu) -// list_menus_map.add(map_firstLevel_menu); -// } -// return list_menus_map; -// -// } + public List> getSourceMenuTree(List list_menu, Map map_selectMenus) { + + //获取当前资源的菜单列表 + List> list_menus_map = new ArrayList>(); + + + //获取资源第一级菜单列表 + List list_firstLevel_menu = list_menu.stream().filter(s -> s.getPSid().equals("0")).collect(Collectors.toList()); + + //遍历资源的第一级菜单 + for (int i = 0; i < list_firstLevel_menu.size(); i++) { + Map map_firstLevel_menu = getMenuTreeFromStream(list_firstLevel_menu.get(i).getSid(), list_menu, map_selectMenus); + //把该菜单挂在当前菜单列表中 + if (null != map_firstLevel_menu) + list_menus_map.add(map_firstLevel_menu); + } + return list_menus_map; + + } /** * 递归把list转换成菜单树形列表 @@ -307,84 +307,84 @@ public class SysMenuService extends MybatisBaseService { * @param list_menu * @return */ -// private Map getMenuTreeFromStream(String psid, List list_menu, Map map_selectMenus) { -// //获取当前菜单 -// List list_current_menu = list_menu.stream().filter(s -> s.getSid().equals(psid)).collect(Collectors.toList()); -// if (null == list_current_menu || 0 == list_current_menu.size()) -// return null; -// -// Map map_menu = getMenuMap(list_current_menu.get(0), map_selectMenus); -// -// //2.获取菜单的子菜单列表 -// //存储最终子菜单列表结果 -// List> list_child = new ArrayList>(); -// -// //获取子菜单列表 -// List list_child_menu = list_menu.stream().filter(s -> s.getPSid().equals(psid)).collect(Collectors.toList()); -// for (int i = 0; i < list_child_menu.size(); i++) { -// //获取该菜单子菜单列表 -// Map map_child_menu = getMenuTreeFromStream(list_child_menu.get(i).getSid(), list_menu, map_selectMenus); -// //把该菜单挂在当前菜单列表中 -// if (null != map_child_menu) -// list_child.add(map_child_menu); -// } -// //把该菜单列表放到父菜单的childMenus中 -// map_menu.put("children", list_child); -// -// return map_menu; -// -// } + private Map getMenuTreeFromStream(String psid, List list_menu, Map map_selectMenus) { + //获取当前菜单 + List list_current_menu = list_menu.stream().filter(s -> s.getSid().equals(psid)).collect(Collectors.toList()); + if (null == list_current_menu || 0 == list_current_menu.size()) + return null; + + Map map_menu = getMenuMap(list_current_menu.get(0), map_selectMenus); + + //2.获取菜单的子菜单列表 + //存储最终子菜单列表结果 + List> list_child = new ArrayList>(); + + //获取子菜单列表 + List list_child_menu = list_menu.stream().filter(s -> s.getPSid().equals(psid)).collect(Collectors.toList()); + for (int i = 0; i < list_child_menu.size(); i++) { + //获取该菜单子菜单列表 + Map map_child_menu = getMenuTreeFromStream(list_child_menu.get(i).getSid(), list_menu, map_selectMenus); + //把该菜单挂在当前菜单列表中 + if (null != map_child_menu) + list_child.add(map_child_menu); + } + //把该菜单列表放到父菜单的childMenus中 + map_menu.put("children", list_child); + + return map_menu; + + } /** * 构造菜单的结果map * * @return */ -// private Map getMenuMap(SysMenuRoleVo menuVo, Map map_selectMenus) { -// Map map_menu = new HashMap(); -// -// if (null != map_selectMenus) { -// //角色授权时，菜单列表 -// map_menu.put("sid", menuVo.getSid()); -// map_menu.put("menuName", menuVo.getMenuName() + (StringUtils.isNotBlank(menuVo.getRemarks()) ? "(" + menuVo.getRemarks() + ")" : "")); -// map_menu.put("menuUrl", menuVo.getMenuUrl()); -// map_menu.put("pageUrl", menuVo.getPageUrl()); -// map_menu.put("iconUrl", menuVo.getIconUrl()); -// map_menu.put("isShow", menuVo.getIsShow()); -// if (menuVo.getAlwaysShow() == 0) { -// map_menu.put("alwaysShow", false); -// } else if (menuVo.getAlwaysShow() == 1) { -// map_menu.put("alwaysShow", true); -// } -// -// //如果角色已有的菜单，则设置选中，并移除map中的项；否则设置不选中 -// if (map_selectMenus.containsKey(menuVo.getSid())) { -// map_menu.put("isCheck", 1); -// map_selectMenus.remove(menuVo.getSid()); -// } else { -// map_menu.put("isCheck", 0); -// } -// } else { -// //左侧菜单列表 -// Map map_meta = new HashMap(); -// map_meta.put("title", menuVo.getMenuName()); -// map_meta.put("icon", menuVo.getIconUrl()); -// map_menu.put("meta", map_meta); -// -// map_menu.put("redirect", menuVo.getPageUrlRedirect()); -// //路径 -// map_menu.put("path", menuVo.getPageUrl() != null && !menuVo.getPageUrl().equals("") ? menuVo.getPageUrl() : "/" + menuVo.getPageName()); -// map_menu.put("name", menuVo.getPageAliasName() != null && !menuVo.getPageAliasName().equals("") ? menuVo.getPageAliasName() : menuVo.getPageUrl()); -// //组件名 -// map_menu.put("component", menuVo.getPageName()); -// if (menuVo.getAlwaysShow() == 0) { -// map_menu.put("alwaysShow", false); -// } else if (menuVo.getAlwaysShow() == 1) { -// map_menu.put("alwaysShow", true); -// } -// } -// return map_menu; -// } + private Map getMenuMap(SysMenuRoleVo menuVo, Map map_selectMenus) { + Map map_menu = new HashMap(); + + if (null != map_selectMenus) { + //角色授权时，菜单列表 + map_menu.put("sid", menuVo.getSid()); + map_menu.put("menuName", menuVo.getMenuName() + (StringUtils.isNotBlank(menuVo.getRemarks()) ? "(" + menuVo.getRemarks() + ")" : "")); + map_menu.put("menuUrl", menuVo.getMenuUrl()); + map_menu.put("pageUrl", menuVo.getPageUrl()); + map_menu.put("iconUrl", menuVo.getIconUrl()); + map_menu.put("isShow", menuVo.getIsShow()); + if (menuVo.getAlwaysShow() == 0) { + map_menu.put("alwaysShow", false); + } else if (menuVo.getAlwaysShow() == 1) { + map_menu.put("alwaysShow", true); + } + + //如果角色已有的菜单，则设置选中，并移除map中的项；否则设置不选中 + if (map_selectMenus.containsKey(menuVo.getSid())) { + map_menu.put("isCheck", 1); + map_selectMenus.remove(menuVo.getSid()); + } else { + map_menu.put("isCheck", 0); + } + } else { + //左侧菜单列表 + Map map_meta = new HashMap(); + map_meta.put("title", menuVo.getMenuName()); + map_meta.put("icon", menuVo.getIconUrl()); + map_menu.put("meta", map_meta); + + map_menu.put("redirect", menuVo.getPageUrlRedirect()); + //路径 + map_menu.put("path", menuVo.getPageUrl() != null && !menuVo.getPageUrl().equals("") ? menuVo.getPageUrl() : "/" + menuVo.getPageName()); + map_menu.put("name", menuVo.getPageAliasName() != null && !menuVo.getPageAliasName().equals("") ? menuVo.getPageAliasName() : menuVo.getPageUrl()); + //组件名 + map_menu.put("component", menuVo.getPageName()); + if (menuVo.getAlwaysShow() == 0) { + map_menu.put("alwaysShow", false); + } else if (menuVo.getAlwaysShow() == 1) { + map_menu.put("alwaysShow", true); + } + } + return map_menu; + } /** * 将该资源下的所有菜单设置为是否可用 diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuTreeVo.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuTreeVo.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java index 6a24e7f..31af1cc 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuTreeVo.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuVo.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysmenu/SysMenuVo.java rename to src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java index a6e18b0..dd8c3bd 100644 --- a/src/main/java/com/yxt/user/biz/sysmenu/SysMenuVo.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysmenu; +package com.yxt.portal.biz.sysmenu; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/MenuRoleVo.java b/src/main/java/com/yxt/portal/biz/sysmenurole/MenuRoleVo.java new file mode 100644 index 0000000..24f9812 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/MenuRoleVo.java @@ -0,0 +1,19 @@ +package com.yxt.portal.biz.sysmenurole; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 菜单和角色临时存储 + * @author: dimengzhe + * @date: 2023/6/1 + **/ +@Data +public class MenuRoleVo { + + + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; + @ApiModelProperty("菜单sid") + private String menuSid; +} diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRole.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRole.java new file mode 100644 index 0000000..6dac1b3 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRole.java @@ -0,0 +1,37 @@ +package com.yxt.portal.biz.sysmenurole; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRole.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRole
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表", description = "菜单与角色关联表") +@TableName("sys_menu_role") +@Data +public class SysMenuRole extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataDto.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataDto.java new file mode 100644 index 0000000..15d47a8 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataDto.java @@ -0,0 +1,30 @@ +package com.yxt.portal.biz.sysmenurole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto
+ * Description: 菜单与角色关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象") +@Data +public class SysMenuRoleDataDto implements Dto { + + @ApiModelProperty("菜单与角色关联表sid") + private String sid; + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataQuery.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataQuery.java new file mode 100644 index 0000000..0b9b94e --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataQuery.java @@ -0,0 +1,30 @@ +package com.yxt.portal.biz.sysmenurole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery
+ * Description: 菜单与角色关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件") +@Data +public class SysMenuRoleDataQuery implements Query { + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("菜单名称") + private String menuName; +} diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataVo.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataVo.java new file mode 100644 index 0000000..4d1a6f8 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDataVo.java @@ -0,0 +1,32 @@ +package com.yxt.portal.biz.sysmenurole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Description: 菜单与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象") +@Data +public class SysMenuRoleDataVo implements Vo { + + @ApiModelProperty("菜单与角色关联表sid") + private String sid; + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)") + private String dataRuleId; +} diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDto.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDto.java new file mode 100644 index 0000000..dce7a20 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleDto.java @@ -0,0 +1,31 @@ +package com.yxt.portal.biz.sysmenurole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto
+ * Description: 菜单与角色关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象") +@Data +public class SysMenuRoleDto implements Dto { + + + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("角色sid") + private String roleSid; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.java new file mode 100644 index 0000000..5d69480 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.java @@ -0,0 +1,60 @@ +package com.yxt.portal.biz.sysmenurole; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.portal.biz.sysmenurole.MenuRoleVo; +import com.yxt.portal.biz.sysmenurole.SysMenuRole; +import com.yxt.portal.biz.sysmenurole.SysMenuRoleDataVo; +import com.yxt.portal.biz.sysmenurole.SysMenuRoleVo; +import org.apache.ibatis.annotations.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleMapper.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper
+ * Description: 菜单与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysMenuRoleMapper extends BaseMapper { + + //@Update("update sys_menu_role set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_menu_role") + List selectListVo(); + + @Delete("delete from sys_menu_role where roleSid=#{roleSid}") + void delByRoleSid(@Param("roleSid") String roleSid); + + List list(@Param(Constants.WRAPPER) QueryWrapper qw); + + List selectByRoleSid(String roleSid); + + List selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw); + + List selMenuByRoleApp(@Param(Constants.WRAPPER) QueryWrapper qw); + + @Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}") + void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId); + + @Update("update sys_mobile_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}") + void updateDataByRoleMenuApp(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId); + + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.xml b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.xml new file mode 100644 index 0000000..e8d947c --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleQuery.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleQuery.java new file mode 100644 index 0000000..7e23f60 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleQuery.java @@ -0,0 +1,40 @@ +package com.yxt.portal.biz.sysmenurole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery
+ * Description: 菜单与角色关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件") +@Data +public class SysMenuRoleQuery implements Query { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("多个角色sid计集合") + private List roleSids; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("是否是系统管理员") + private String isAdmin; +} diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleService.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleService.java new file mode 100644 index 0000000..0ca9c25 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleService.java @@ -0,0 +1,213 @@ +package com.yxt.portal.biz.sysmenurole; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.portal.biz.sysmenurole.*; +import com.yxt.portal.biz.sysmenu.SysMenuService; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleService.java
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleService
+ * Description: 菜单与角色关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysMenuRoleService extends MybatisBaseService { + @Autowired + private SysMenuService sysMenuService; + + public PagerVo listPage(PagerQuery pq) { + SysMenuRoleQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAll(SysMenuRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysMenuRoleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getMenuSid())) { + qw.eq("menuSid", query.getMenuSid()); + } + + if (StringUtils.isNotBlank(query.getRoleSid())) { + qw.eq("roleSid", query.getRoleSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysMenuRoleQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(SysMenuRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysMenuRoleDto dto) { + SysMenuRole entity = new SysMenuRole(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysMenuRoleVo fetchByIdVo(String id) { + SysMenuRole entity = this.fetchById(id); + SysMenuRoleVo vo = new SysMenuRoleVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByRoleSid(String roleSid) { + baseMapper.delByRoleSid(roleSid); + } + + // 不分页列表 + public List list(SysMenuRoleQuery query) { + // mybits所用的查询条件封装类 + QueryWrapper qw = buildQueryWrapper(query); + return baseMapper.list(qw); + } + + /** + * 解析和组装查询条件，封装在qw中 + * + * @param query + * @return + */ + private QueryWrapper buildQueryWrapper(SysMenuRoleQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + if (StringUtils.isNotBlank(query.getSourceSid())) { + qw.eq("m.sourceSid", query.getSourceSid()); + } + /*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) { + qw.in("rm.roleSid", query.getRoleSid()); + }*/ + if (StringUtils.isNotBlank(query.getIsAdmin())) { + if (!query.getIsAdmin().equals("1")){ + qw.eq("m.isEnable", 1); + } + } + + if (query.getRoleSids() != null && query.getRoleSids().size() > 0) { + qw.in("rm.roleSid", query.getRoleSids()); + } + qw.eq("m.isShow", 1); + qw.orderByAsc("m.sortNo"); + } + + return qw; + + } + + /** + * 资源菜单树形列表 + * + * @param query:roleSids,sourceSid + * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单） + */ + public List> getSourceMenuTreeOfRoles(SysMenuRoleQuery query, Map map_rolemenus) { + + //获取当前资源的菜单列表 + List> list_menus_map = new ArrayList>(); + if (null == query) + return list_menus_map; + + //角色s的某个资源的所有菜单列表 + List list_menu = list(query); + list_menus_map = sysMenuService.getSourceMenuTree(list_menu, map_rolemenus); + + return list_menus_map; + + } + + public List selectByRoleSid(String roleSid) { + return baseMapper.selectByRoleSid(roleSid); + } + + public ResultBean> selMenuByRole(SysMenuRoleDataQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("smr.roleSid",query.getRoleSid()); + if (StringUtils.isNotBlank(query.getMenuName())){ + qw.like("sm.name",query.getMenuName()); + } + List sysMenuRoleDataVos = baseMapper.selMenuByRole(qw); + return rb.success().setData(sysMenuRoleDataVos); + } + + public ResultBean> selMenuByRoleApp(SysMenuRoleDataQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("smmr.roleSid",query.getRoleSid()); + if (StringUtils.isNotBlank(query.getMenuName())){ + qw.like("smm.name",query.getMenuName()); + } + List sysMenuRoleDataVos = baseMapper.selMenuByRoleApp(qw); + return rb.success().setData(sysMenuRoleDataVos); + } + + public ResultBean updateDataByRoleMenu(List dtos) { + ResultBean rb = ResultBean.fireFail(); + for (SysMenuRoleDataDto dto : dtos) { + if (StringUtils.isNotBlank(dto.getDataRuleId())){ + baseMapper.updateDataByRoleMenu(dto.getSid(),dto.getDataRuleId()); + } + } + return rb.success(); + } + + public ResultBean updateDataByRoleMenuApp(List dtos) { + ResultBean rb = ResultBean.fireFail(); + for (SysMenuRoleDataDto dto : dtos) { + if (StringUtils.isNotBlank(dto.getDataRuleId())){ + baseMapper.updateDataByRoleMenuApp(dto.getSid(),dto.getDataRuleId()); + } + } + return rb.success(); + } + + ///----获平台角色s的某个资源的菜单树形列表（内存操作） 开始---- + + +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleVo.java b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleVo.java new file mode 100644 index 0000000..0d34b53 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/sysmenurole/SysMenuRoleVo.java @@ -0,0 +1,56 @@ +package com.yxt.portal.biz.sysmenurole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo
+ * Description: 菜单与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象") +@Data +public class SysMenuRoleVo implements Vo { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("菜单父级sid") + private String pSid; + @ApiModelProperty("menusid") + private String sid; + @ApiModelProperty("menuUrl") + private String menuUrl; + @ApiModelProperty("menuName") + private String menuName; + @ApiModelProperty("pageUrl") + private String pageUrl; + @ApiModelProperty("iconUrl") + private String iconUrl; + @ApiModelProperty("isShow") + private String isShow; + @ApiModelProperty("alwaysShow") + private Integer alwaysShow; + @ApiModelProperty("pageUrlRedirect") + private String pageUrlRedirect; + @ApiModelProperty("pageAliasName") + private String pageAliasName; + @ApiModelProperty("pageName") + private String pageName; + @ApiModelProperty("remarks") + private String remarks; +} diff --git a/src/main/java/com/yxt/user/biz/sysorganization/AppContactSysOrganizationVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/AppContactSysOrganizationVo.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysorganization/AppContactSysOrganizationVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/AppContactSysOrganizationVo.java index d4efdf4..ca3d0c0 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/AppContactSysOrganizationVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/AppContactSysOrganizationVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/QrCodeVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/QrCodeVo.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysorganization/QrCodeVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/QrCodeVo.java index 7407c84..ad9176e 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/QrCodeVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/QrCodeVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrgListVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrgListVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrgListVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrgListVo.java index 8b8d451..ea69b60 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrgListVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrgListVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrgStaffVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrgStaffVo.java similarity index 87% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrgStaffVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrgStaffVo.java index 8e38002..2703169 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrgStaffVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrgStaffVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrgVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrgVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrgVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrgVo.java index 5a0b0bf..9522cc8 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrgVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrgVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganization.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganization.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganization.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganization.java index a9a4e57..cd0e66b 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganization.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganization.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationDto.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationDto.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationDto.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationDto.java index 2356120..0632ecf 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationDto.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListQuery.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListQuery.java similarity index 87% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListQuery.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListQuery.java index 7e0ae49..fa0b9e4 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListVo.java similarity index 90% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListVo.java index 1ae7282..eee045c 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListsVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListsVo.java similarity index 87% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListsVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListsVo.java index 7c7e4a5..190cda1 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationListsVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationListsVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java index 8d84393..8fbf3b9 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java @@ -1,10 +1,10 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.user.biz.sysstafforg.SysStaffOrgVo; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.xml b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml similarity index 73% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.xml rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml index 55c9640..70991d6 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -1,9 +1,9 @@ - + - SELECT so.*, (SELECT GROUP_CONCAT(ss.name) FROM `sys_staff_org` sso @@ -33,7 +33,7 @@ ORDER BY so.sort - SELECT * FROM sys_organization @@ -41,13 +41,13 @@ - SELECT sid, name, psid, orgCode FROM sys_organization WHERE psid = '0' - SELECT sid, name, psid, orgCode FROM sys_organization WHERE psid = #{psid} @@ -68,7 +68,7 @@ - SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath, so.orgCode FROM sys_organization so WHERE psid = #{psid} - SELECT * FROM sys_organization WHERE psid = '0' - SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath FROM sys_organization so WHERE isDept = 0 ORDER BY psid - SELECT * FROM sys_organization LIMIT 0,1 - SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode FROM sys_organization so WHERE psid = #{psid} - select * from sys_organization where orgCode = #{substring} - SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode FROM sys_organization so WHERE psid = #{psid} ORDER BY so.sort ASC - select orgSidPath from sys_staff_org where staffSid = #{staffSid} - SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode FROM sys_organization so WHERE sid = #{sid} @@ -150,7 +150,7 @@ WHERE sid = #{sid} - SELECT so.name departmentName, so.qrText qrFilePath, so.addrs address, so.sid FROM sys_organization so WHERE so.sid = #{sid} @@ -166,7 +166,7 @@ AND isDept = 0 - SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath FROM sys_organization so WHERE isDept = 0 @@ -174,45 +174,45 @@ ORDER BY psid - select so.name orgDeptName, so.sid orgDeptSid from sys_organization so where so.psid = #{orgSid} and orgAttributeKey = 'DP03_SYS' - select so.name orgDeptName, so.sid orgDeptSid from sys_organization so where so.psid = #{orgSid} - select distinct si.name staffName, si.sid staffSid from sys_staff_org so left join sys_staffinfo si on so.staffSid = si.sid where so.orgSid = #{orgDeptSid} - select * from sys_organization where psid = #{sid} and name = #{name} - select sid,name,orgCode from sys_organization so where so.isDept = 0 - SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath FROM sys_organization so WHERE isDept = 1 AND so.psid = #{orgSid} - SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath FROM sys_organization so WHERE isDept = 0 AND so.psid = #{psid} diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationQuery.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationQuery.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationQuery.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationQuery.java index e662bf3..52c845f 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationService.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationService.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationService.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationService.java index 7ed758a..3e5ca76 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationService.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationService.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,12 +10,12 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfo; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService; -import com.yxt.user.biz.sysstafforg.SysStaffOrg; -import com.yxt.user.biz.sysstafforg.SysStaffOrgService; -import com.yxt.user.biz.sysstafforg.SysStaffOrgVo; -import com.yxt.user.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.portal.biz.sysstafforg.SysStaffOrg; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo; +import com.yxt.portal.biz.sysuser.SysUserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationVo.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationVo.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationVo.java rename to src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationVo.java index aec8f83..2a9f87d 100644 --- a/src/main/java/com/yxt/user/biz/sysorganization/SysOrganizationVo.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysorganization; +package com.yxt.portal.biz.sysorganization; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPost.java b/src/main/java/com/yxt/portal/biz/syspost/SysPost.java similarity index 96% rename from src/main/java/com/yxt/user/biz/syspost/SysPost.java rename to src/main/java/com/yxt/portal/biz/syspost/SysPost.java index 032f39d..fc887e4 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPost.java +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPost.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syspost; +package com.yxt.portal.biz.syspost; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostDto.java b/src/main/java/com/yxt/portal/biz/syspost/SysPostDto.java similarity index 96% rename from src/main/java/com/yxt/user/biz/syspost/SysPostDto.java rename to src/main/java/com/yxt/portal/biz/syspost/SysPostDto.java index 5677149..634adae 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPostDto.java +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPostDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syspost; +package com.yxt.portal.biz.syspost; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostListVo.java b/src/main/java/com/yxt/portal/biz/syspost/SysPostListVo.java similarity index 93% rename from src/main/java/com/yxt/user/biz/syspost/SysPostListVo.java rename to src/main/java/com/yxt/portal/biz/syspost/SysPostListVo.java index 1f1a013..bda7c78 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPostListVo.java +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPostListVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syspost; +package com.yxt.portal.biz.syspost; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostMapper.java b/src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.java similarity index 92% rename from src/main/java/com/yxt/user/biz/syspost/SysPostMapper.java rename to src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.java index e48d3bb..bea1d1f 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPostMapper.java +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.java @@ -1,12 +1,9 @@ -package com.yxt.user.biz.syspost; +package com.yxt.portal.biz.syspost; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.user.biz.syspost.SysPost; -import com.yxt.user.biz.syspost.SysPostListVo; -import com.yxt.user.biz.syspost.SysPostVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostMapper.xml b/src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.xml similarity index 78% rename from src/main/java/com/yxt/user/biz/syspost/SysPostMapper.xml rename to src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.xml index 6eab28d..23e2f66 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPostMapper.xml +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPostMapper.xml @@ -1,9 +1,9 @@ - + - SELECT post.sid sid, post.name name, post.orgSid, @@ -23,7 +23,7 @@ - SELECT * FROM sys_post @@ -31,12 +31,12 @@ - select name, postCode, sid from sys_post - select * from sys_post where postCode = #{substring} diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostQuery.java b/src/main/java/com/yxt/portal/biz/syspost/SysPostQuery.java similarity index 96% rename from src/main/java/com/yxt/user/biz/syspost/SysPostQuery.java rename to src/main/java/com/yxt/portal/biz/syspost/SysPostQuery.java index 5fc6705..13cd46f 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPostQuery.java +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPostQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syspost; +package com.yxt.portal.biz.syspost; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostService.java b/src/main/java/com/yxt/portal/biz/syspost/SysPostService.java similarity index 94% rename from src/main/java/com/yxt/user/biz/syspost/SysPostService.java rename to src/main/java/com/yxt/portal/biz/syspost/SysPostService.java index 5338914..0e992de 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPostService.java +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPostService.java @@ -1,16 +1,14 @@ -package com.yxt.user.biz.syspost; +package com.yxt.portal.biz.syspost; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sysorganization.SysOrganization; -import com.yxt.user.biz.syspost.*; -import com.yxt.user.biz.sysorganization.SysOrganizationService; +import com.yxt.portal.biz.sysorganization.SysOrganization; +import com.yxt.portal.biz.sysorganization.SysOrganizationService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysorganization.SysOrganizationService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/yxt/user/biz/syspost/SysPostVo.java b/src/main/java/com/yxt/portal/biz/syspost/SysPostVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/syspost/SysPostVo.java rename to src/main/java/com/yxt/portal/biz/syspost/SysPostVo.java index 8fe7977..fb8d2f3 100644 --- a/src/main/java/com/yxt/user/biz/syspost/SysPostVo.java +++ b/src/main/java/com/yxt/portal/biz/syspost/SysPostVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syspost; +package com.yxt.portal.biz.syspost; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/sysrole/SysRole.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRole.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysrole/SysRole.java rename to src/main/java/com/yxt/portal/biz/sysrole/SysRole.java index f861947..e1146f5 100644 --- a/src/main/java/com/yxt/user/biz/sysrole/SysRole.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRole.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysrole; +package com.yxt.portal.biz.sysrole; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/sysrole/SysRoleDto.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleDto.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysrole/SysRoleDto.java rename to src/main/java/com/yxt/portal/biz/sysrole/SysRoleDto.java index 5dca1ca..7c91487 100644 --- a/src/main/java/com/yxt/user/biz/sysrole/SysRoleDto.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysrole; +package com.yxt.portal.biz.sysrole; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.java rename to src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java index ee1295e..ab5f45d 100644 --- a/src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.java @@ -1,10 +1,10 @@ -package com.yxt.user.biz.sysrole; +package com.yxt.portal.biz.sysrole; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.user.biz.sysuser.SysMenuRoleVoList; +import com.yxt.portal.biz.sysuser.SysMenuRoleVoList; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.xml b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml similarity index 86% rename from src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.xml rename to src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml index 2a8a050..848f3c0 100644 --- a/src/main/java/com/yxt/user/biz/sysrole/SysRoleMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleMapper.xml @@ -1,9 +1,9 @@ - + - SELECT sr.*, sp.sid as postSid, sp.name as postName FROM sys_role sr LEFT JOIN sys_post sp ON sr.postSid = sp.sid @@ -13,32 +13,32 @@ ORDER BY sr.sort - SELECT * FROM sys_role ${ew.sqlSegment} - SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked FROM sys_role role LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid` AND userRole.userSid = #{param1} - SELECT role.name, role.remarks, role.sid FROM sys_role role left join sys_user_role userrole on userrole.roleSid = role.sid where userrole.userSid = #{param1} - SELECT * FROM sys_role role where role.name = #{param1} - SELECT role.*, post.sid as postSid, post.name as postName FROM sys_role role LEFT JOIN sys_post post ON role.postSid = post.sid @@ -91,14 +91,14 @@ where userSid = #{userSid} - select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue,smr.dataRuleId from sys_role sr left join sys_menu_role smr on sr.sid = smr.roleSid where smr.menuSid = #{menuSid} - select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue from sys_role sr left join sys_mobile_menu_role smr on sr.sid = smr.roleSid diff --git a/src/main/java/com/yxt/user/biz/sysrole/SysRoleQuery.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleQuery.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysrole/SysRoleQuery.java rename to src/main/java/com/yxt/portal/biz/sysrole/SysRoleQuery.java index cd99d04..87225a1 100644 --- a/src/main/java/com/yxt/user/biz/sysrole/SysRoleQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysrole; +package com.yxt.portal.biz.sysrole; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysrole/SysRoleService.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysrole/SysRoleService.java rename to src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java index f32a78e..5983b79 100644 --- a/src/main/java/com/yxt/user/biz/sysrole/SysRoleService.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java @@ -1,10 +1,10 @@ -package com.yxt.user.biz.sysrole; +package com.yxt.portal.biz.sysrole; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sysuser.SysMenuRoleVoList; -import com.yxt.user.biz.sysuserrole.SysUserRoleService; +import com.yxt.portal.biz.sysuser.SysMenuRoleVoList; +import com.yxt.portal.biz.sysuserrole.SysUserRoleService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; diff --git a/src/main/java/com/yxt/user/biz/sysrole/SysRoleVo.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysrole/SysRoleVo.java rename to src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java index 07e0439..ebe0635 100644 --- a/src/main/java/com/yxt/user/biz/sysrole/SysRoleVo.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysrole; +package com.yxt.portal.biz.sysrole; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSource.java b/src/main/java/com/yxt/portal/biz/syssource/SysSource.java similarity index 98% rename from src/main/java/com/yxt/user/biz/syssource/SysSource.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSource.java index 8ac8ffe..c409fe6 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSource.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSource.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceDto.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceDto.java similarity index 98% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceDto.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceDto.java index b1a51ad..7cc501d 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceDto.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceFeign.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceFeign.java similarity index 98% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceFeign.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceFeign.java index eae604f..b4184fb 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceFeign.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceFeign.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceFeignFallback.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceFeignFallback.java similarity index 98% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceFeignFallback.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceFeignFallback.java index 872d07f..aeb095f 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceFeignFallback.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceFeignFallback.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceMapper.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.java similarity index 91% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceMapper.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.java index cc6fe8a..0cbd94a 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceMapper.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.java @@ -1,11 +1,11 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.user.biz.sysfunction.SysFunctionTreeVo; -import com.yxt.user.biz.sysmenu.SysMenuTreeVo; +import com.yxt.portal.biz.sysfunction.SysFunctionTreeVo; +import com.yxt.portal.biz.sysmenu.SysMenuTreeVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceMapper.xml b/src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.xml similarity index 69% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceMapper.xml rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.xml index 6b06f08..e731c11 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceMapper.xml +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM sys_source @@ -11,26 +11,26 @@ - SELECT * FROM sys_source ${ew.sqlSegment} - SELECT source.*, ISNULL(sourceRole.sid) as checked FROM sys_source source left join sys_source_role sourceRole on source.sid = sourceRole.sorceSid and sourceRole.roleSid = #{param1} - select sourceName as name, sourceName as sourceName, sid as sourceSid, sid as sid from sys_source where sourceName like '${name}%' - select sourceName as name, diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceQuery.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceQuery.java similarity index 98% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceQuery.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceQuery.java index 2b7cbfd..fe8f199 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceQuery.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceService.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java similarity index 97% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceService.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java index acb5971..305ff15 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceService.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceService.java @@ -1,10 +1,10 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sysfunction.SysFunctionTreeVo; -import com.yxt.user.biz.sysmenu.SysMenuTreeVo; +import com.yxt.portal.biz.sysfunction.SysFunctionTreeVo; +import com.yxt.portal.biz.sysmenu.SysMenuTreeVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; diff --git a/src/main/java/com/yxt/user/biz/syssource/SysSourceVo.java b/src/main/java/com/yxt/portal/biz/syssource/SysSourceVo.java similarity index 96% rename from src/main/java/com/yxt/user/biz/syssource/SysSourceVo.java rename to src/main/java/com/yxt/portal/biz/syssource/SysSourceVo.java index a543c66..546fd67 100644 --- a/src/main/java/com/yxt/user/biz/syssource/SysSourceVo.java +++ b/src/main/java/com/yxt/portal/biz/syssource/SysSourceVo.java @@ -1,7 +1,7 @@ -package com.yxt.user.biz.syssource; +package com.yxt.portal.biz.syssource; -import com.yxt.user.biz.sysmenu.SysMenuVo; +import com.yxt.portal.biz.sysmenu.SysMenuVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/AppContactsDetailsVo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/AppContactsDetailsVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/AppContactsDetailsVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/AppContactsDetailsVo.java index a9edb5a..27fc2b5 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/AppContactsDetailsVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/AppContactsDetailsVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/PcSysStaffQuery.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/PcSysStaffQuery.java similarity index 90% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/PcSysStaffQuery.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/PcSysStaffQuery.java index adec731..9f2d245 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/PcSysStaffQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/PcSysStaffQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/PcSysStaffVo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/PcSysStaffVo.java similarity index 91% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/PcSysStaffVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/PcSysStaffVo.java index 1605bfd..f09e28a 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/PcSysStaffVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/PcSysStaffVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffQuery.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffQuery.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffQuery.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffQuery.java index 4661505..caa8f3b 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfo.java similarity index 99% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfo.java index 538acd5..040e1fc 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java index 1dc4ac4..f38aef2 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoAppContactsVo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoAppContactsVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoAppContactsVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoAppContactsVo.java index 2d8e9e0..c165f5a 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoAppContactsVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoAppContactsVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoDetailsVo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDetailsVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoDetailsVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDetailsVo.java index 5e37e0d..e32576f 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoDetailsVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDetailsVo.java @@ -1,7 +1,7 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; -import com.yxt.user.biz.sysstafforg.SysStaffOrgDetailsVo; -import com.yxt.user.biz.sysstaffpost.SysStaffPostDetailsVo; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgDetailsVo; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostDetailsVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoDto.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDto.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoDto.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDto.java index ecf9ad3..17226fa 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoDto.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoDto.java @@ -1,9 +1,9 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.user.biz.sysstafforg.SysStaffOrgDto; -import com.yxt.user.biz.sysstaffpost.SysStaffPostDto; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgDto; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoMapper.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoMapper.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.java index 8e647ed..896d9c6 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.java @@ -1,13 +1,12 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.user.biz.sysorganization.AppContactSysOrganizationVo; -import com.yxt.user.biz.sysstaffinfo.*; -import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.portal.biz.sysorganization.AppContactSysOrganizationVo; +import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoMapper.xml b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml similarity index 90% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoMapper.xml rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index 70526cf..371772a 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -1,11 +1,11 @@ - + - SELECT staff.name, staff.mobile, user.headImage, @@ -57,7 +57,7 @@ - select * from sys_staffinfo order by jobNumber desc limit 1 - select * from sys_staffinfo where mobile = #{mobile} - select * from sys_staffinfo where idNo = #{idNo} - select DISTINCT si.sid, si.jobNumber, @@ -127,21 +127,21 @@ ${ew.customSqlSegment} - select * from sys_staffinfo where mobile = #{mobile} and sid <> #{sid} - select * from sys_staffinfo where idNo = #{idNo} and sid <> #{sid} - select jobNumber, @@ -309,7 +309,7 @@ where sid = #{sid} - select su.sid userSid, si.name staffName from sys_staff_org sso left join sys_staffinfo si on sso.staffSid = si.sid @@ -334,7 +334,7 @@ ${ew.customSqlSegment} - select su.sid userSid, si.name userName, su.headImage, @@ -359,7 +359,7 @@ group by su.sid - select su.sid as userSid, si.name as userName, su.headImage, @@ -382,14 +382,14 @@ - select su.sid userSid, si.name staffName from sys_user su left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL - select su.sid userSid, si.name staffName from sys_user su diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoQuery.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoQuery.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoQuery.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoQuery.java index 84197ef..1904189 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoService.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoService.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java index e540964..265f577 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoService.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -1,29 +1,29 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sysorganization.AppContactSysOrganizationVo; -import com.yxt.user.biz.sysorganization.SysOrganization; -import com.yxt.user.biz.syspost.SysPostService; -import com.yxt.user.biz.sysrole.SysRoleVo; -import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffQuery; -import com.yxt.user.biz.sysstaffinfo.app.AppSysStaffVo; -import com.yxt.user.biz.sysstafforg.SysStaffOrg; -import com.yxt.user.biz.sysstafforg.SysStaffOrgDetailsVo; -import com.yxt.user.biz.sysstafforg.SysStaffOrgDto; -import com.yxt.user.biz.sysstafforg.SysStaffOrgVo; -import com.yxt.user.biz.sysstaffpost.SysStaffPost; -import com.yxt.user.biz.sysstaffpost.SysStaffPostDetailsVo; -import com.yxt.user.biz.sysstaffpost.SysStaffPostDto; -import com.yxt.user.biz.sysuser.SysUser; -import com.yxt.user.biz.sysuserrole.SysUserRole; -import com.yxt.user.biz.sysorganization.SysOrganizationService; -import com.yxt.user.biz.sysrole.SysRoleService; -import com.yxt.user.biz.sysstafforg.SysStaffOrgService; -import com.yxt.user.biz.sysstaffpost.SysStaffPostService; -import com.yxt.user.biz.sysuser.SysUserService; -import com.yxt.user.biz.sysuserrole.SysUserRoleService; +import com.yxt.portal.biz.sysorganization.AppContactSysOrganizationVo; +import com.yxt.portal.biz.sysorganization.SysOrganization; +import com.yxt.portal.biz.syspost.SysPostService; +import com.yxt.portal.biz.sysrole.SysRoleVo; +import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.portal.biz.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.portal.biz.sysstafforg.SysStaffOrg; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgDetailsVo; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgDto; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo; +import com.yxt.portal.biz.sysstaffpost.SysStaffPost; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostDetailsVo; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostDto; +import com.yxt.portal.biz.sysuser.SysUser; +import com.yxt.portal.biz.sysuserrole.SysUserRole; +import com.yxt.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.portal.biz.sysrole.SysRoleService; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostService; +import com.yxt.portal.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysuserrole.SysUserRoleService; import com.yxt.common.base.config.RedisUtil; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoVo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoVo.java index 16b0395..f8938de 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/SysStaffinfoVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/SysStaffinfoVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/WxBase64Query.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/WxBase64Query.java similarity index 91% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/WxBase64Query.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/WxBase64Query.java index a2addb0..1f7dcbe 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/WxBase64Query.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/WxBase64Query.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/WxSysInfoQuery.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/WxSysInfoQuery.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/WxSysInfoQuery.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/WxSysInfoQuery.java index df2aac3..866ba2f 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/WxSysInfoQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/WxSysInfoQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo; +package com.yxt.portal.biz.sysstaffinfo; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/app/AppSysStaffQuery.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/app/AppSysStaffQuery.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/app/AppSysStaffQuery.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/app/AppSysStaffQuery.java index da16755..dfecb84 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/app/AppSysStaffQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/app/AppSysStaffQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo.app; +package com.yxt.portal.biz.sysstaffinfo.app; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffinfo/app/AppSysStaffVo.java b/src/main/java/com/yxt/portal/biz/sysstaffinfo/app/AppSysStaffVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysstaffinfo/app/AppSysStaffVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffinfo/app/AppSysStaffVo.java index 100145c..a1c566f 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffinfo/app/AppSysStaffVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffinfo/app/AppSysStaffVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffinfo.app; +package com.yxt.portal.biz.sysstaffinfo.app; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrg.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrg.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrg.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrg.java index 6a8020e..983b97a 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrg.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrg.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgByUserVo.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgByUserVo.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgByUserVo.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgByUserVo.java index 502ae6c..533710c 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgByUserVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgByUserVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgDetailsVo.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDetailsVo.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgDetailsVo.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDetailsVo.java index e473ccf..029c658 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgDetailsVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDetailsVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgDto.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDto.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgDto.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDto.java index 7e4d8b9..f53b21b 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgDto.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgMapper.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgMapper.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java index b59bb2d..8488860 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -1,11 +1,11 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.user.biz.sysuserdefaultorg.SysOrgPathList; +import com.yxt.portal.biz.sysuserdefaultorg.SysOrgPathList; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgMapper.xml b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml similarity index 80% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgMapper.xml rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml index 50d297f..f6705bf 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM sys_staff_org @@ -11,14 +11,14 @@ - SELECT * FROM sys_staff_org ${ew.sqlSegment} - SELECT DISTINCT ss.`name` staffName, ss.`mobile`, ss.sid staffSid FROM `sys_staff_org` sso LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid` @@ -28,14 +28,14 @@ - select * from sys_staff_org where staffSid = #{sid} and orgSid = #{orgSid} - select sso.orgSid, sso.orgName, sso.orgNamePath, sso.orgNamePath, sso.manageType, so.orgCode from sys_staff_org sso left join sys_organization so on sso.orgSid = so.sid @@ -43,7 +43,7 @@ and sso.orgSid = #{orgSid} - select sso.orgSid, sso.orgName, sso.orgNamePath, sso.manageType, so.orgCode, sso.orgSidPath from sys_staff_org sso left join sys_organization so on sso.orgSid = so.sid @@ -83,7 +83,7 @@ and orgSidPath = #{sid} - select * from sys_staff_org where staffSid = #{staffSid} @@ -105,20 +105,20 @@ and su.sid = #{userSid} - select * from sys_staff_org sso where sso.orgSidPath = #{orgPath} and sso.staffSid = #{staffSid} - select sid as staffOrgSid, orgSidPath, orgNamePath from sys_staff_org where staffSid = #{staffSid} - select * from sys_staff_org where orgSid = #{orgSid} @@ -131,7 +131,7 @@ where orgSidPath like concat('%', #{orgSid}, '%') - SELECT su.`sid`, ss.`name` @@ -148,7 +148,7 @@ - SELECT su.sid, ss.`name` FROM sys_staff_org so diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgQuery.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgQuery.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgQuery.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgQuery.java index e0a0e07..41625af 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgService.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgService.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java index 311096a..edb88fc 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgService.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgService.java @@ -1,14 +1,13 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sysorganization.SysOrganization; -import com.yxt.user.biz.sysstafforg.*; -import com.yxt.user.biz.sysuser.SysUserInfoVo; -import com.yxt.user.biz.sysuserdefaultorg.SysOrgPathList; -import com.yxt.user.biz.sysorganization.SysOrganizationService; -import com.yxt.user.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysorganization.SysOrganization; +import com.yxt.portal.biz.sysuser.SysUserInfoVo; +import com.yxt.portal.biz.sysuserdefaultorg.SysOrgPathList; +import com.yxt.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.portal.biz.sysuser.SysUserService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; diff --git a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgVo.java b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgVo.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgVo.java rename to src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgVo.java index 7576b12..31eef64 100644 --- a/src/main/java/com/yxt/user/biz/sysstafforg/SysStaffOrgVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstafforg/SysStaffOrgVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstafforg; +package com.yxt.portal.biz.sysstafforg; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPost.java b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPost.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPost.java rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPost.java index ec68576..7060fd9 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPost.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPost.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffpost; +package com.yxt.portal.biz.sysstaffpost; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostDetailsVo.java b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostDetailsVo.java similarity index 93% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostDetailsVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostDetailsVo.java index 3d0fffb..6868fdf 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostDetailsVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostDetailsVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffpost; +package com.yxt.portal.biz.sysstaffpost; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostDto.java b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostDto.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostDto.java rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostDto.java index 3e9b8a4..c3311f8 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostDto.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffpost; +package com.yxt.portal.biz.sysstaffpost; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostMapper.java b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostMapper.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostMapper.java rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostMapper.java index 50148f3..1eca77e 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostMapper.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffpost; +package com.yxt.portal.biz.sysstaffpost; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostMapper.xml b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostMapper.xml similarity index 74% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostMapper.xml rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostMapper.xml index 7a055a9..3c95aeb 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostMapper.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM sys_staff_post @@ -11,7 +11,7 @@ - SELECT * FROM sys_staff_post @@ -19,14 +19,14 @@ - select * from sys_staff_post where staffSid = #{sid} and postSid = #{postSid} - select ssp.postSid, ssp.isDepetHead, sp.postCode, sp.name from sys_staff_post ssp left join sys_post sp on sp.sid = ssp.postSid @@ -34,7 +34,7 @@ and ssp.postSid = #{postSid} - select ssp.*, sp.name from sys_staff_post ssp left join sys_post sp diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostQuery.java b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostQuery.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostQuery.java rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostQuery.java index 3c30868..c922f56 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffpost; +package com.yxt.portal.biz.sysstaffpost; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostService.java b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostService.java similarity index 99% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostService.java rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostService.java index f500b6e..59da58e 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostService.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostService.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffpost; +package com.yxt.portal.biz.sysstaffpost; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostVo.java b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostVo.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostVo.java rename to src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostVo.java index 78f8ab5..e385100 100644 --- a/src/main/java/com/yxt/user/biz/sysstaffpost/SysStaffPostVo.java +++ b/src/main/java/com/yxt/portal/biz/sysstaffpost/SysStaffPostVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysstaffpost; +package com.yxt.portal.biz.sysstaffpost; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/yxt/user/biz/sysuser/PrivilegeQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/PrivilegeQuery.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysuser/PrivilegeQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/PrivilegeQuery.java index f15e97b..3253e8b 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/PrivilegeQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/PrivilegeQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysuser/ShareUserQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/ShareUserQuery.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysuser/ShareUserQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/ShareUserQuery.java index 15876cb..5be4968 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/ShareUserQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/ShareUserQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysHaveMessageQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/SysHaveMessageQuery.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysuser/SysHaveMessageQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysHaveMessageQuery.java index befcf35..7931072 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysHaveMessageQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysHaveMessageQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysMenuRoleVoList.java b/src/main/java/com/yxt/portal/biz/sysuser/SysMenuRoleVoList.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysuser/SysMenuRoleVoList.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysMenuRoleVoList.java index 44fb3c3..667ab4c 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysMenuRoleVoList.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysMenuRoleVoList.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUser.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUser.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysuser/SysUser.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUser.java index 0d2772b..1c2e21d 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUser.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUser.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserDto.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserDto.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserDto.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserDto.java index 2186c77..73d0b9b 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserDto.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserInfoVo.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserInfoVo.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserInfoVo.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserInfoVo.java index d4af762..b9d8954 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserInfoVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserInfoVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserListVo.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserListVo.java similarity index 89% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserListVo.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserListVo.java index 225bf44..9ca5494 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserListVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserListVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserMapper.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.java similarity index 93% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserMapper.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.java index a565132..6a9f659 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.java @@ -1,17 +1,14 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoVo; -import com.yxt.user.biz.sysuser.SysUser; -import com.yxt.user.biz.sysuser.SysUserInfoVo; -import com.yxt.user.biz.sysuser.SysUserVo; -import com.yxt.user.biz.sysuser.app.AppUserOrgInfoVo; -import com.yxt.user.biz.sysuser.wx.WxHomePageVo; -import com.yxt.user.biz.sysuser.wx.WxMySysUserInfoVo; -import com.yxt.user.biz.sysuser.wx.WxSysUserVo; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoVo; +import com.yxt.portal.biz.sysuser.app.AppUserOrgInfoVo; +import com.yxt.portal.biz.sysuser.wx.WxHomePageVo; +import com.yxt.portal.biz.sysuser.wx.WxMySysUserInfoVo; +import com.yxt.portal.biz.sysuser.wx.WxSysUserVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserMapper.xml b/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml similarity index 88% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserMapper.xml rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml index d4553be..4f0d4ee 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserMapper.xml @@ -1,9 +1,9 @@ - + - SELECT DISTINCT user.staffSid, user.isEnable, ( @@ -39,12 +39,12 @@ LEFT JOIN sys_role role ON role.sid = user_role.roleSid WHERE user_role.userSid = USER.sid ) roleName, - dict.dictValue userType, +-- dict.dictValue userType, user.userType userTypeKey FROM sys_user USER LEFT JOIN sys_user_role user_role ON user_role.userSid = USER.sid LEFT JOIN sys_role role ON role.sid = user_role.roleSid - LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType' +-- LEFT JOIN dict_common dict ON dict.dictKey = user.userType AND dict.dictType = 'userType' LEFT JOIN sys_staffinfo staff ON staff.sid = user.staffSid ${ew.sqlSegment} @@ -103,14 +103,14 @@ - SELECT * FROM sys_user ${ew.sqlSegment} - SELECT su.* FROM sys_user su left join sys_staffinfo si on si.sid = su.staffSid @@ -118,7 +118,7 @@ and su.isDelete = 0 and su.userType = 1 - SELECT su.* FROM sys_user su left join sys_staffinfo si on si.sid = su.staffSid @@ -127,7 +127,7 @@ and su.userType = 1 - SELECT su.* FROM sys_user su left join sys_staffinfo si on si.sid = su.staffSid @@ -136,7 +136,7 @@ and su.userType = 1 - SELECT * FROM sys_user where userName = #{userName} @@ -160,7 +160,7 @@ where sid = #{param1} - SELECT * FROM sys_user WHERE isDelete = 0 @@ -168,14 +168,14 @@ AND userType = #{userType} - SELECT su.headImage FROM sys_user su WHERE su.sid = #{userSid} AND su.isDelete = 0 - SELECT su.mobile, su.userType, su.userName, su.sid userSid, su.staffSid, su.token FROM sys_user su WHERE su.userName = #{userName} @@ -183,13 +183,13 @@ AND su.isDelete = 0 - SELECT su.headImage, su.staffSid FROM sys_user su WHERE su.sid = #{userSid} AND su.isDelete = 0 - SELECT * FROM sys_user su LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid @@ -197,7 +197,7 @@ AND su.isDelete = 0 - SELECT su.staffSid, ss.name staffName, sso.orgSid, sso.orgName, sso.orgSidPath, so.orgCode FROM sys_user su LEFT JOIN sys_staffinfo ss ON su.staffSid = ss.sid @@ -208,7 +208,7 @@ LIMIT 1 - SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode, su.mobile FROM sys_user su LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid @@ -219,7 +219,7 @@ LIMIT 1 - SELECT su.staffSid, si.name staffName, sso.orgSid, sso.orgName, so.orgCode FROM sys_user su LEFT JOIN sys_staffinfo si ON su.staffSid = si.sid @@ -244,7 +244,7 @@ where staffSid = #{sid} - select su.* from sys_user su left join sys_staffinfo si on si.sid = su.staffSid @@ -259,7 +259,7 @@ WHERE sid = #{sid} - SELECT su.sid, ss.name, sso.orgNamePath departmentName FROM `sys_user` su LEFT JOIN `sys_staffinfo` ss ON su.staffSid = ss.sid @@ -269,7 +269,7 @@ WHERE sr.sid = #{roleSid} - select distinct si.name, su.sid, su.staffSid from sys_user_role sr left join sys_user su on sr.userSid = su.sid @@ -311,7 +311,7 @@ , '%') - select su.*, ss.name from sys_user su left join sys_staffinfo ss on su.staffSid = ss.sid @@ -321,7 +321,7 @@ - select si.name, su.sid, su.staffSid from sys_user_role sr left join sys_user su on sr.userSid = su.sid @@ -348,7 +348,7 @@ - select distinct si.name, su.sid, su.staffSid, so.orgSidPath from sys_user_role sr left join sys_user su on sr.userSid = su.sid diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserQuery.java similarity index 97% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserQuery.java index 549f218..d214e38 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserService.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java similarity index 93% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserService.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java index 414a8fa..ede4034 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserService.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserService.java @@ -1,33 +1,30 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.user.biz.sms.SmsFeign; -import com.yxt.user.biz.sysmenu.SysMenu; +import com.yxt.portal.biz.sms.SmsFeign; +import com.yxt.portal.biz.sysmenu.SysMenu; //import com.yxt.user.biz.sysmobilemenu.SysMobileMenu; -import com.yxt.user.biz.sysorganization.SysOrganization; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfo; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoVo; -import com.yxt.user.biz.sysstafforg.SysStaffOrg; -import com.yxt.user.biz.sysstafforg.SysStaffOrgVo; -import com.yxt.user.biz.sysstaffpost.SysStaffPostDetailsVo; -import com.yxt.user.biz.sysuser.*; -import com.yxt.user.biz.sysmenu.SysMenuService; - -import com.yxt.user.biz.sysorganization.SysOrganizationService; -import com.yxt.user.biz.sysrole.SysRoleService; -import com.yxt.user.biz.sysstaffinfo.SysStaffinfoService; -import com.yxt.user.biz.sysstafforg.SysStaffOrgService; -import com.yxt.user.biz.sysstaffpost.SysStaffPostService; +import com.yxt.portal.biz.sysorganization.SysOrganization; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfo; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoVo; +import com.yxt.portal.biz.sysstafforg.SysStaffOrg; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgVo; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostDetailsVo; +import com.yxt.portal.biz.sysmenu.SysMenuService; + +import com.yxt.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.portal.biz.sysrole.SysRoleService; +import com.yxt.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.portal.biz.sysstaffpost.SysStaffPostService; //import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgService; -import com.yxt.user.biz.sysuser.app.OrgList; -import com.yxt.user.biz.sysuser.wx.WxMySysUserInfoVo; -import com.yxt.user.biz.sysuser.wx.WxSysUserVo; -import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrg; -import com.yxt.user.biz.sysuserdefaultorg.SysUserDefaultOrgService; -import com.yxt.user.biz.sysuserrole.SysUserRoleService; +import com.yxt.portal.biz.sysuser.app.OrgList; +import com.yxt.portal.biz.sysuser.wx.WxMySysUserInfoVo; +import com.yxt.portal.biz.sysuserdefaultorg.SysUserDefaultOrgService; +import com.yxt.portal.biz.sysuserrole.SysUserRoleService; import com.yxt.common.base.config.RedisUtil; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.ImageUploadUtil; @@ -36,8 +33,7 @@ import com.yxt.common.base.utils.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.user.biz.sysorganization.SysOrganizationService; -import com.yxt.user.config.DictCommonType; +import com.yxt.portal.config.DictCommonType; import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -135,10 +131,10 @@ public class SysUserService extends MybatisBaseService { if (StringUtils.isNotBlank(query.getRoleSid())) { qw.eq("role.sid", query.getRoleSid()); } - if (StringUtils.isNotBlank(query.getName())) { - qw.like("staff.name", query.getName()); - } - qw.ne("staff.personTypeKey", "01"); +// if (StringUtils.isNotBlank(query.getName())) { +// qw.like("staff.name", query.getName()); +// } +// qw.ne("staff.personTypeKey", "01"); return qw; } @@ -760,7 +756,7 @@ public class SysUserService extends MybatisBaseService { int num = result; verificationCode = verificationCode + num; } - String verificationCode1 = "个人注册验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略。"; + String verificationCode1 = "注册验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略。"+"【商享通】"; try { //============ //当前时间秒数 @@ -783,7 +779,7 @@ public class SysUserService extends MybatisBaseService { boolean str = redisUtil.exists(mobile); if (!str) { redisUtil.set(mobile, (verificationCode + timemili)); - String result = com.yxt.user.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); if (!RESULT_CODE.equals(result)) { return ResultBean.fireFail().setMsg("发送短信验证码失败"); } @@ -795,7 +791,7 @@ public class SysUserService extends MybatisBaseService { } else { //发送短信 redisUtil.set(mobile, (verificationCode + timemili)); - String result = com.yxt.user.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); if (!RESULT_CODE.equals(result)) { return ResultBean.fireFail().setMsg("发送短信验证码失败"); } @@ -818,7 +814,7 @@ public class SysUserService extends MybatisBaseService { int num = result; verificationCode = verificationCode + num; } - String verificationCode1 = "个人登录验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略。"; + String verificationCode1 ="登录验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略。"+"【商享通】"; try { //============ //当前时间秒数 @@ -841,7 +837,7 @@ public class SysUserService extends MybatisBaseService { boolean str = redisUtil.exists(mobile); if (!str) { redisUtil.set(mobile, (verificationCode + timemili)); - String result = com.yxt.user.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); if (!RESULT_CODE.equals(result)) { return ResultBean.fireFail().setMsg("发送短信验证码失败"); } @@ -853,7 +849,7 @@ public class SysUserService extends MybatisBaseService { } else { //发送短信 redisUtil.set(mobile, (verificationCode + timemili)); - String result = com.yxt.user.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); if (!RESULT_CODE.equals(result)) { return ResultBean.fireFail().setMsg("发送短信验证码失败"); } @@ -866,7 +862,64 @@ public class SysUserService extends MybatisBaseService { //============= return ResultBean.fireSuccess().setMsg("发送短信验证码成功"); } + public ResultBean getVerificationCodeU(String mobile, String verificationCode) { + for (int i = 0; i < LENGTH_OF_CODE; i++) { + // 定义随机类 + Random random = new Random(); + // 返回[0,10)集合中的整数，注意不包括10 + int result = random.nextInt(10); + // +1后，[0,10)集合变为[1,11)集合，满足要求 + int num = result; + verificationCode = verificationCode + num; + } + String verificationCode1 = "修改验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略。"+"【商享通】"; + try { + //============ + //当前时间秒数 + Long timemili = System.currentTimeMillis() / 1000; + System.out.println("当前的秒数" + timemili); + /*在这里写一个定时的for循环，用来取redis的手机号码信息，然后查询手机号码开始的时间，若是大于等于五分钟就给删除这个键值*/ + //创建多线程定时任务，延迟1s启动，每隔1s执行一次，是前一个任务开始时就开始计算时间间隔，但是会等上一个任务结束在开始下一个 + ScheduledExecutorService scheduledExecutorService = newScheduledThreadPool(10); + scheduledExecutorService.scheduleAtFixedRate(new Runnable() { + @Override + public void run() { + //判断这个键的值是不是超过五分钟，是的话就删除掉这个键 + if (System.currentTimeMillis() / 1000 - Long.parseLong(redisUtil.get(mobile).substring(4)) > 300) { + redisUtil.remove(mobile); + } + } + }, 1, 2, TimeUnit.SECONDS); + //设置键值的时候先查询是否存在这个键值对，存在的话查看时长，不存在的话直接发送短信 + boolean str = redisUtil.exists(mobile); + if (!str) { + redisUtil.set(mobile, (verificationCode + timemili)); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + if (!RESULT_CODE.equals(result)) { + return ResultBean.fireFail().setMsg("发送短信验证码失败"); + } + } else { + String strT = redisUtil.get(mobile); + //查看请求间隔,默认是一分钟,小于一分钟继续等待，超过一分钟发送短信 + if (timemili - Long.parseLong(strT.substring(4)) < 60) { + return ResultBean.fireFail().setMsg("请等待一分钟后再次重试!"); + } else { + //发送短信 + redisUtil.set(mobile, (verificationCode + timemili)); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + if (!RESULT_CODE.equals(result)) { + return ResultBean.fireFail().setMsg("发送短信验证码失败"); + } + + } + } + } catch (Exception e) { + return ResultBean.fireFail().setMsg("发送短信验证码失败"); + } + //============= + return ResultBean.fireSuccess().setMsg("发送短信验证码成功"); + } /** * 验证手机号和验证码是否正确及匹配 * @@ -1077,7 +1130,7 @@ public class SysUserService extends MybatisBaseService { boolean str = redisUtil.exists(key); //设置键值的时候先查询是否存在这个键值对，存在的话查看时长，不存在的话直接发送短信 if (!str) { redisUtil.set(key, (verificationCode + timemili)); - String result = com.yxt.user.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); if (!RESULT_CODE.equals(result)) { return ResultBean.fireFail().setMsg("发送短信验证码失败"); } @@ -1089,7 +1142,7 @@ public class SysUserService extends MybatisBaseService { } else { //发送短信 redisUtil.set(key, (verificationCode + timemili)); - String result = com.yxt.user.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + String result = com.yxt.portal.utils.MsgWs.SendWaitWorkMsg(mobile, verificationCode1); if (!RESULT_CODE.equals(result)) { return ResultBean.fireFail().setMsg("发送短信验证码失败"); } diff --git a/src/main/java/com/yxt/user/biz/sysuser/SysUserVo.java b/src/main/java/com/yxt/portal/biz/sysuser/SysUserVo.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuser/SysUserVo.java rename to src/main/java/com/yxt/portal/biz/sysuser/SysUserVo.java index 8e8e002..dc6f817 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/SysUserVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/SysUserVo.java @@ -1,10 +1,10 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; -import com.yxt.user.biz.sysorganization.SysOrganization; -import com.yxt.user.biz.sysuser.app.OrgList; +import com.yxt.portal.biz.sysorganization.SysOrganization; +import com.yxt.portal.biz.sysuser.app.OrgList; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysuser/UserByRolesAndOrgQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/UserByRolesAndOrgQuery.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysuser/UserByRolesAndOrgQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/UserByRolesAndOrgQuery.java index 5abe88c..21fa01b 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/UserByRolesAndOrgQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/UserByRolesAndOrgQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/UserQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/UserQuery.java similarity index 93% rename from src/main/java/com/yxt/user/biz/sysuser/UserQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/UserQuery.java index 5cf650d..2da5c4e 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/UserQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/UserQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/UserRoleQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/UserRoleQuery.java similarity index 91% rename from src/main/java/com/yxt/user/biz/sysuser/UserRoleQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/UserRoleQuery.java index 36a8bf6..3005fa7 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/UserRoleQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/UserRoleQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/UserssQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/UserssQuery.java similarity index 88% rename from src/main/java/com/yxt/user/biz/sysuser/UserssQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/UserssQuery.java index 6115ec8..ffb3455 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/UserssQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/UserssQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser; +package com.yxt.portal.biz.sysuser; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysuser/app/AppMySysUserInfo.java b/src/main/java/com/yxt/portal/biz/sysuser/app/AppMySysUserInfo.java similarity index 93% rename from src/main/java/com/yxt/user/biz/sysuser/app/AppMySysUserInfo.java rename to src/main/java/com/yxt/portal/biz/sysuser/app/AppMySysUserInfo.java index 8506a2e..52b256b 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/app/AppMySysUserInfo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/app/AppMySysUserInfo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.app; +package com.yxt.portal.biz.sysuser.app; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/app/AppUserOrgInfoVo.java b/src/main/java/com/yxt/portal/biz/sysuser/app/AppUserOrgInfoVo.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuser/app/AppUserOrgInfoVo.java rename to src/main/java/com/yxt/portal/biz/sysuser/app/AppUserOrgInfoVo.java index 0e21eb0..cdaff6d 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/app/AppUserOrgInfoVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/app/AppUserOrgInfoVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.app; +package com.yxt.portal.biz.sysuser.app; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/app/MyInfoQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/app/MyInfoQuery.java similarity index 91% rename from src/main/java/com/yxt/user/biz/sysuser/app/MyInfoQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/app/MyInfoQuery.java index aa161b5..fbd7304 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/app/MyInfoQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/app/MyInfoQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.app; +package com.yxt.portal.biz.sysuser.app; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/app/OrgList.java b/src/main/java/com/yxt/portal/biz/sysuser/app/OrgList.java similarity index 89% rename from src/main/java/com/yxt/user/biz/sysuser/app/OrgList.java rename to src/main/java/com/yxt/portal/biz/sysuser/app/OrgList.java index b46f873..68db2b8 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/app/OrgList.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/app/OrgList.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.app; +package com.yxt.portal.biz.sysuser.app; import com.yxt.common.core.vo.Vo; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysuser/wx/WxHomePageVo.java b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxHomePageVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysuser/wx/WxHomePageVo.java rename to src/main/java/com/yxt/portal/biz/sysuser/wx/WxHomePageVo.java index 6ea0ca9..afe88f8 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/wx/WxHomePageVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxHomePageVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.wx; +package com.yxt.portal.biz.sysuser.wx; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/wx/WxMySysUserInfoVo.java b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxMySysUserInfoVo.java similarity index 94% rename from src/main/java/com/yxt/user/biz/sysuser/wx/WxMySysUserInfoVo.java rename to src/main/java/com/yxt/portal/biz/sysuser/wx/WxMySysUserInfoVo.java index 1f1b2df..287dad8 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/wx/WxMySysUserInfoVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxMySysUserInfoVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.wx; +package com.yxt.portal.biz.sysuser.wx; import com.yxt.common.core.utils.desensitized.Sensitive; import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum; diff --git a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserDto.java b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserDto.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserDto.java rename to src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserDto.java index ce16440..64a495c 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserDto.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.wx; +package com.yxt.portal.biz.sysuser.wx; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserLoginQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserLoginQuery.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserLoginQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserLoginQuery.java index b7f6eda..78d3d98 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserLoginQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserLoginQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.wx; +package com.yxt.portal.biz.sysuser.wx; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserRegistQuery.java b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserRegistQuery.java similarity index 91% rename from src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserRegistQuery.java rename to src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserRegistQuery.java index 6c44049..fa13cb9 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserRegistQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserRegistQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.wx; +package com.yxt.portal.biz.sysuser.wx; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserVo.java b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserVo.java similarity index 96% rename from src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserVo.java rename to src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserVo.java index 4af05ed..4801b61 100644 --- a/src/main/java/com/yxt/user/biz/sysuser/wx/WxSysUserVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuser/wx/WxSysUserVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuser.wx; +package com.yxt.portal.biz.sysuser.wx; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysOrgPathList.java b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysOrgPathList.java similarity index 90% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysOrgPathList.java rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysOrgPathList.java index 7d8000e..9a69722 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysOrgPathList.java +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysOrgPathList.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserdefaultorg; +package com.yxt.portal.biz.sysuserdefaultorg; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrg.java b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrg.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrg.java rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrg.java index 5429353..92b02f8 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrg.java +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrg.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserdefaultorg; +package com.yxt.portal.biz.sysuserdefaultorg; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgDto.java b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgDto.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgDto.java rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgDto.java index 5de5293..c9f5981 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgDto.java +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserdefaultorg; +package com.yxt.portal.biz.sysuserdefaultorg; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java similarity index 88% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java index 7afe7ad..1c02277 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserdefaultorg; +package com.yxt.portal.biz.sysuserdefaultorg; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml similarity index 69% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml index dfc540d..5473d0c 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgMapper.xml @@ -1,7 +1,7 @@ - - select * from sys_user_default_org where createBySid = #{userSid} diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgQuery.java b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgQuery.java similarity index 85% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgQuery.java rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgQuery.java index d8c6518..064bc81 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserdefaultorg; +package com.yxt.portal.biz.sysuserdefaultorg; import com.yxt.common.core.query.Query; import lombok.Data; diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgService.java b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgService.java similarity index 92% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgService.java rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgService.java index a1a2a52..6f4854b 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgService.java +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgService.java @@ -1,9 +1,8 @@ -package com.yxt.user.biz.sysuserdefaultorg; +package com.yxt.portal.biz.sysuserdefaultorg; -import com.yxt.user.biz.sysuser.SysUser; -import com.yxt.user.biz.sysuserdefaultorg.*; -import com.yxt.user.biz.sysstafforg.SysStaffOrgService; -import com.yxt.user.biz.sysuser.SysUserService; +import com.yxt.portal.biz.sysuser.SysUser; +import com.yxt.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.portal.biz.sysuser.SysUserService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.result.ResultBean; diff --git a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java similarity index 93% rename from src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java rename to src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java index 68d4f6d..7fc8672 100644 --- a/src/main/java/com/yxt/user/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuserdefaultorg/SysUserDefaultOrgVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserdefaultorg; +package com.yxt.portal.biz.sysuserdefaultorg; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRole.java b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRole.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuserrole/SysUserRole.java rename to src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRole.java index 25364f7..829fbca 100644 --- a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRole.java +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRole.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserrole; +package com.yxt.portal.biz.sysuserrole; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleDto.java b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleDto.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleDto.java rename to src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleDto.java index b82c622..a2c5337 100644 --- a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleDto.java +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleDto.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserrole; +package com.yxt.portal.biz.sysuserrole; import com.yxt.common.core.dto.Dto; diff --git a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleMapper.java b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java similarity index 98% rename from src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleMapper.java rename to src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java index a5c70eb..ae5a09c 100644 --- a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserrole; +package com.yxt.portal.biz.sysuserrole; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleMapper.xml b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml similarity index 82% rename from src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleMapper.xml rename to src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml index a6774fb..4b757aa 100644 --- a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleMapper.xml @@ -1,16 +1,16 @@ - + - SELECT * FROM sys_user_role ${ew.sqlSegment} - SELECT * FROM sys_user_role ${ew.sqlSegment} - SELECT * FROM sys_user_role WHERE userSid = #{userSid} diff --git a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleQuery.java b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleQuery.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleQuery.java rename to src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleQuery.java index a7f12b7..beb4caa 100644 --- a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleQuery.java +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleQuery.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserrole; +package com.yxt.portal.biz.sysuserrole; import com.yxt.common.core.query.Query; diff --git a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleService.java b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleService.java similarity index 99% rename from src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleService.java rename to src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleService.java index 3fa418b..d4e7c35 100644 --- a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleService.java +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleService.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserrole; +package com.yxt.portal.biz.sysuserrole; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleVo.java b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleVo.java similarity index 95% rename from src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleVo.java rename to src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleVo.java index 12e53e2..3ee785f 100644 --- a/src/main/java/com/yxt/user/biz/sysuserrole/SysUserRoleVo.java +++ b/src/main/java/com/yxt/portal/biz/sysuserrole/SysUserRoleVo.java @@ -1,4 +1,4 @@ -package com.yxt.user.biz.sysuserrole; +package com.yxt.portal.biz.sysuserrole; import com.yxt.common.core.vo.Vo; diff --git a/src/main/java/com/yxt/user/config/DictCommonType.java b/src/main/java/com/yxt/portal/config/DictCommonType.java similarity index 99% rename from src/main/java/com/yxt/user/config/DictCommonType.java rename to src/main/java/com/yxt/portal/config/DictCommonType.java index 69414a7..19427c5 100644 --- a/src/main/java/com/yxt/user/config/DictCommonType.java +++ b/src/main/java/com/yxt/portal/config/DictCommonType.java @@ -1,4 +1,4 @@ -package com.yxt.user.config; +package com.yxt.portal.config; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/yxt/user/config/SaTokenConfigure.java b/src/main/java/com/yxt/portal/config/SaTokenConfigure.java similarity index 99% rename from src/main/java/com/yxt/user/config/SaTokenConfigure.java rename to src/main/java/com/yxt/portal/config/SaTokenConfigure.java index aa0d55b..bf988e0 100644 --- a/src/main/java/com/yxt/user/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/portal/config/SaTokenConfigure.java @@ -1,4 +1,4 @@ -package com.yxt.user.config;//package com.yxt.base.config; +package com.yxt.portal.config;//package com.yxt.base.config; // //import cn.dev33.satoken.interceptor.SaInterceptor; //import cn.dev33.satoken.stp.StpUtil; diff --git a/src/main/java/com/yxt/user/config/SaTokenGloableException.java b/src/main/java/com/yxt/portal/config/SaTokenGloableException.java similarity index 98% rename from src/main/java/com/yxt/user/config/SaTokenGloableException.java rename to src/main/java/com/yxt/portal/config/SaTokenGloableException.java index 0edf964..c93a107 100644 --- a/src/main/java/com/yxt/user/config/SaTokenGloableException.java +++ b/src/main/java/com/yxt/portal/config/SaTokenGloableException.java @@ -1,4 +1,4 @@ -package com.yxt.user.config; +package com.yxt.portal.config; import com.yxt.common.base.config.handler.GlobalExceptionHandler; import com.yxt.common.core.result.ResultBean; diff --git a/src/main/java/com/yxt/user/feign/package-info.java b/src/main/java/com/yxt/portal/config/package-info.java similarity index 77% rename from src/main/java/com/yxt/user/feign/package-info.java rename to src/main/java/com/yxt/portal/config/package-info.java index 400fc49..b912f5a 100644 --- a/src/main/java/com/yxt/user/feign/package-info.java +++ b/src/main/java/com/yxt/portal/config/package-info.java @@ -1,4 +1,4 @@ /** * 宇信通监管项目-光伏（山海新能源）项目后台逻辑和接口-接口声明 */ -package com.yxt.user.feign; \ No newline at end of file +package com.yxt.portal.config; \ No newline at end of file diff --git a/src/main/java/com/yxt/user/config/package-info.java b/src/main/java/com/yxt/portal/feign/package-info.java similarity index 77% rename from src/main/java/com/yxt/user/config/package-info.java rename to src/main/java/com/yxt/portal/feign/package-info.java index ca2eccf..537a7e8 100644 --- a/src/main/java/com/yxt/user/config/package-info.java +++ b/src/main/java/com/yxt/portal/feign/package-info.java @@ -1,4 +1,4 @@ /** * 宇信通监管项目-光伏（山海新能源）项目后台逻辑和接口-接口声明 */ -package com.yxt.user.config; \ No newline at end of file +package com.yxt.portal.feign; \ No newline at end of file diff --git a/src/main/java/com/yxt/user/utils/DoubleUtils.java b/src/main/java/com/yxt/portal/utils/DoubleUtils.java similarity index 98% rename from src/main/java/com/yxt/user/utils/DoubleUtils.java rename to src/main/java/com/yxt/portal/utils/DoubleUtils.java index 27f1528..43cf1d1 100644 --- a/src/main/java/com/yxt/user/utils/DoubleUtils.java +++ b/src/main/java/com/yxt/portal/utils/DoubleUtils.java @@ -1,4 +1,4 @@ -package com.yxt.user.utils; +package com.yxt.portal.utils; import java.math.BigDecimal; diff --git a/src/main/java/com/yxt/user/utils/MsgWs.java b/src/main/java/com/yxt/portal/utils/MsgWs.java similarity index 92% rename from src/main/java/com/yxt/user/utils/MsgWs.java rename to src/main/java/com/yxt/portal/utils/MsgWs.java index 4a55dd7..f0e1d64 100644 --- a/src/main/java/com/yxt/user/utils/MsgWs.java +++ b/src/main/java/com/yxt/portal/utils/MsgWs.java @@ -1,6 +1,5 @@ -package com.yxt.user.utils; +package com.yxt.portal.utils; -import com.yxt.user.biz.sms.SmsFeign; import org.apache.axis.client.Call; import org.apache.axis.client.Service; import org.apache.axis.encoding.XMLType; @@ -39,7 +38,7 @@ public class MsgWs { call.addParameter(new QName("http://tempuri.org/", "SendTime"), XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.IN); // String[] fn01 = {"YXT010045", "yuxintonghygl", mobile, msgtitle+msg+msgSign, "", ""}; - String[] fn01 = {"YXT011852", "yxt_ar230314", mobile, msg+ SmsFeign.msgSign, "", ""}; + String[] fn01 = {"YXT004911", "yyundong@yuxintong", mobile, msg, "", ""}; String val = (String) call.invoke(fn01); // String val = "-1";//用于先去掉短信功能，不发短信 return val; diff --git a/src/main/java/com/yxt/user/utils/PinYinUtils.java b/src/main/java/com/yxt/portal/utils/PinYinUtils.java similarity index 99% rename from src/main/java/com/yxt/user/utils/PinYinUtils.java rename to src/main/java/com/yxt/portal/utils/PinYinUtils.java index 88b8e0c..da3e90b 100644 --- a/src/main/java/com/yxt/user/utils/PinYinUtils.java +++ b/src/main/java/com/yxt/portal/utils/PinYinUtils.java @@ -1,4 +1,4 @@ -package com.yxt.user.utils; +package com.yxt.portal.utils; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType; diff --git a/src/main/java/com/yxt/user/utils/StyleUtils.java b/src/main/java/com/yxt/portal/utils/StyleUtils.java similarity index 99% rename from src/main/java/com/yxt/user/utils/StyleUtils.java rename to src/main/java/com/yxt/portal/utils/StyleUtils.java index 1d7945c..2124b28 100644 --- a/src/main/java/com/yxt/user/utils/StyleUtils.java +++ b/src/main/java/com/yxt/portal/utils/StyleUtils.java @@ -1,4 +1,4 @@ -package com.yxt.user.utils; +package com.yxt.portal.utils; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont;