From 589fc9e0493af580e621231defb7bc0c527402bc Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Thu, 29 Dec 2022 13:54:26 +0800 Subject: [PATCH] 2 --- yxt_supervise/pom.xml | 1 + .../PurchaseRequisitionStore.java | 72 ++ .../PurchaseRequisitionStoreDetailsVo.java | 72 ++ .../PurchaseRequisitionStoreDto.java | 72 ++ .../PurchaseRequisitionStoreFeign.java | 78 ++ ...PurchaseRequisitionStoreFeignFallback.java | 72 ++ .../PurchaseRequisitionStoreQuery.java | 70 + .../PurchaseRequisitionStoreVo.java | 72 ++ .../PurchaseRequisitionTobacco.java | 104 ++ .../PurchaseRequisitionTobaccoDetailsVo.java | 108 ++ .../PurchaseRequisitionTobaccoDto.java | 108 ++ .../PurchaseRequisitionTobaccoFeign.java | 78 ++ ...rchaseRequisitionTobaccoFeignFallback.java | 72 ++ .../PurchaseRequisitionTobaccoQuery.java | 106 ++ .../PurchaseRequisitionTobaccoVo.java | 108 ++ .../PurchaseRequisitionTobaccoDetails.java} | 73 +- ...aseRequisitionTobaccoDetailsDetailsVo.java | 79 ++ .../PurchaseRequisitionTobaccoDetailsDto.java | 79 ++ ...urchaseRequisitionTobaccoDetailsFeign.java | 78 ++ ...equisitionTobaccoDetailsFeignFallback.java | 72 ++ ...urchaseRequisitionTobaccoDetailsQuery.java | 77 ++ .../PurchaseRequisitionTobaccoDetailsVo.java | 79 ++ .../portal/api/sysfunction/SysFunction.java | 49 + .../api/sysfunction/SysFunctionDto.java | 51 + .../api/sysfunction/SysFunctionFeign.java | 88 ++ .../sysfunction/SysFunctionFeignFallback.java | 92 ++ .../api/sysfunction/SysFunctionQuery.java | 50 + .../api/sysfunction/SysFunctionTreeVo.java | 50 + .../portal/api/sysfunction/SysFunctionVo.java | 51 + .../portal/api/sysmapping/SaveListDto.java | 21 + .../portal/api/sysmapping/SysMapping.java | 68 + .../api/sysmapping/SysMappingDetailsVo.java | 68 + .../portal/api/sysmapping/SysMappingDto.java | 70 + .../api/sysmapping/SysMappingFeign.java | 98 ++ .../sysmapping/SysMappingFeignFallback.java | 93 ++ .../api/sysmapping/SysMappingInfoQuery.java | 25 + .../sysmapping/SysMappingInfoQueryBatch.java | 27 + .../api/sysmapping/SysMappingInfoVo.java | 27 + .../api/sysmapping/SysMappingListDto.java | 65 + .../sysmapping/SysMappingListInfoQuery.java | 13 + .../api/sysmapping/SysMappingQuery.java | 76 ++ .../portal/api/sysmapping/SysMappingVo.java | 76 ++ .../yxt/anrui/portal/api/sysmenu/SysMenu.java | 64 + .../anrui/portal/api/sysmenu/SysMenuDto.java | 72 ++ .../portal/api/sysmenu/SysMenuFeign.java | 114 ++ .../api/sysmenu/SysMenuFeignFallback.java | 100 ++ .../portal/api/sysmenu/SysMenuQuery.java | 66 + .../portal/api/sysmenu/SysMenuTreeVo.java | 59 + .../anrui/portal/api/sysmenu/SysMenuVo.java | 74 ++ .../portal/api/sysmenurole/SysMenuRole.java | 34 + .../api/sysmenurole/SysMenuRoleDto.java | 32 + .../api/sysmenurole/SysMenuRoleFeign.java | 67 + .../sysmenurole/SysMenuRoleFeignFallback.java | 69 + .../api/sysmenurole/SysMenuRoleQuery.java | 40 + .../portal/api/sysmenurole/SysMenuRoleVo.java | 56 + .../AppContactSysOrganizationVo.java | 40 + .../portal/api/sysorganization/QrCodeVo.java | 23 + .../api/sysorganization/SysOrgListVo.java | 29 + .../api/sysorganization/SysOrgStaffVo.java | 17 + .../portal/api/sysorganization/SysOrgVo.java | 31 + .../api/sysorganization/SysOrganization.java | 87 ++ .../sysorganization/SysOrganizationDto.java | 91 ++ .../sysorganization/SysOrganizationFeign.java | 182 +++ .../SysOrganizationFeignFallback.java | 184 +++ .../SysOrganizationListQuery.java | 16 + .../SysOrganizationListVo.java | 23 + .../SysOrganizationListsVo.java | 17 + .../sysorganization/SysOrganizationQuery.java | 58 + .../sysorganization/SysOrganizationVo.java | 86 ++ .../yxt/anrui/portal/api/syspost/SysPost.java | 46 + .../anrui/portal/api/syspost/SysPostDto.java | 44 + .../portal/api/syspost/SysPostFeign.java | 89 ++ .../api/syspost/SysPostFeignFallback.java | 91 ++ .../portal/api/syspost/SysPostListVo.java | 22 + .../portal/api/syspost/SysPostQuery.java | 41 + .../anrui/portal/api/syspost/SysPostVo.java | 52 + .../yxt/anrui/portal/api/sysrole/SysRole.java | 48 + .../anrui/portal/api/sysrole/SysRoleDto.java | 51 + .../portal/api/sysrole/SysRoleFeign.java | 83 ++ .../api/sysrole/SysRoleFeignFallback.java | 91 ++ .../portal/api/sysrole/SysRoleQuery.java | 38 + .../anrui/portal/api/sysrole/SysRoleVo.java | 47 + .../api/sysrolefunction/SysRoleFunction.java | 34 + .../sysrolefunction/SysRoleFunctionDto.java | 32 + .../sysrolefunction/SysRoleFunctionFeign.java | 67 + .../SysRoleFunctionFeignFallback.java | 69 + .../sysrolefunction/SysRoleFunctionQuery.java | 32 + .../sysrolefunction/SysRoleFunctionVo.java | 32 + .../anrui/portal/api/syssource/SysSource.java | 76 ++ .../portal/api/syssource/SysSourceDto.java | 76 ++ .../portal/api/syssource/SysSourceFeign.java | 73 ++ .../api/syssource/SysSourceFeignFallback.java | 81 ++ .../portal/api/syssource/SysSourceQuery.java | 78 ++ .../portal/api/syssource/SysSourceVo.java | 85 ++ .../syssourcefunction/SysSourceFunction.java | 34 + .../SysSourceFunctionDto.java | 32 + .../SysSourceFunctionFeign.java | 64 + .../SysSourceFunctionFeignFallback.java | 64 + .../SysSourceFunctionQuery.java | 32 + .../SysSourceFunctionVo.java | 32 + .../api/syssourcemenu/SysSourceMenu.java | 33 + .../api/syssourcemenu/SysSourceMenuDto.java | 32 + .../api/syssourcemenu/SysSourceMenuFeign.java | 64 + .../SysSourceMenuFeignFallback.java | 60 + .../api/syssourcemenu/SysSourceMenuQuery.java | 32 + .../api/syssourcemenu/SysSourceMenuVo.java | 36 + .../api/syssourcerole/SysSourceRole.java | 34 + .../api/syssourcerole/SysSourceRoleDto.java | 32 + .../api/syssourcerole/SysSourceRoleFeign.java | 68 + .../SysSourceRoleFeignFallback.java | 69 + .../api/syssourcerole/SysSourceRoleQuery.java | 32 + .../api/syssourcerole/SysSourceRoleVo.java | 32 + .../sysstaffinfo/AppContactsDetailsVo.java | 34 + .../api/sysstaffinfo/PcSysStaffQuery.java | 18 + .../portal/api/sysstaffinfo/PcSysStaffVo.java | 17 + .../api/sysstaffinfo/SysStaffQuery.java | 30 + .../portal/api/sysstaffinfo/SysStaffinfo.java | 173 +++ .../SysStaffinfoAppContactsSearchVo.java | 34 + .../SysStaffinfoAppContactsVo.java | 34 + .../sysstaffinfo/SysStaffinfoDetailsVo.java | 155 +++ .../api/sysstaffinfo/SysStaffinfoDto.java | 185 +++ .../api/sysstaffinfo/SysStaffinfoFeign.java | 139 ++ .../SysStaffinfoFeignFallback.java | 96 ++ .../api/sysstaffinfo/SysStaffinfoQuery.java | 42 + .../api/sysstaffinfo/SysStaffinfoVo.java | 47 + .../api/sysstaffinfo/WxBase64Query.java | 20 + .../api/sysstaffinfo/WxSysInfoQuery.java | 37 + .../sysstaffinfo/app/AppSysStaffQuery.java | 27 + .../api/sysstaffinfo/app/AppSysStaffVo.java | 30 + .../portal/api/sysstafforg/SysStaffOrg.java | 46 + .../api/sysstafforg/SysStaffOrgDetailsVo.java | 28 + .../api/sysstafforg/SysStaffOrgDto.java | 42 + .../api/sysstafforg/SysStaffOrgFeign.java | 112 ++ .../sysstafforg/SysStaffOrgFeignFallback.java | 112 ++ .../api/sysstafforg/SysStaffOrgQuery.java | 44 + .../portal/api/sysstafforg/SysStaffOrgVo.java | 48 + .../portal/api/sysstaffpost/SysStaffPost.java | 47 + .../sysstaffpost/SysStaffPostDetailsVo.java | 24 + .../api/sysstaffpost/SysStaffPostDto.java | 36 + .../api/sysstaffpost/SysStaffPostFeign.java | 68 + .../SysStaffPostFeignFallback.java | 69 + .../api/sysstaffpost/SysStaffPostQuery.java | 46 + .../api/sysstaffpost/SysStaffPostVo.java | 46 + .../yxt/anrui/portal/api/sysuser/SysUser.java | 68 + .../anrui/portal/api/sysuser/SysUserDto.java | 42 + .../portal/api/sysuser/SysUserFeign.java | 235 ++++ .../api/sysuser/SysUserFeignFallback.java | 217 ++++ .../portal/api/sysuser/SysUserInfoVo.java | 30 + .../portal/api/sysuser/SysUserListVo.java | 19 + .../portal/api/sysuser/SysUserQuery.java | 51 + .../anrui/portal/api/sysuser/SysUserVo.java | 93 ++ .../anrui/portal/api/sysuser/UserQuery.java | 21 + .../portal/api/sysuser/UserRoleQuery.java | 19 + .../api/sysuser/app/AppMySysUserInfo.java | 28 + .../api/sysuser/app/AppSysUserFeign.java | 86 ++ .../sysuser/app/AppSysUserFeignFallback.java | 68 + .../api/sysuser/app/AppUserOrgInfoVo.java | 34 + .../portal/api/sysuser/app/MyInfoQuery.java | 19 + .../anrui/portal/api/sysuser/app/OrgList.java | 17 + .../portal/api/sysuser/wx/WxHomePageVo.java | 27 + .../api/sysuser/wx/WxMySysUserInfoVo.java | 23 + .../portal/api/sysuser/wx/WxSysUserDto.java | 33 + .../portal/api/sysuser/wx/WxSysUserFeign.java | 116 ++ .../sysuser/wx/WxSysUserFeignFallback.java | 12 + .../api/sysuser/wx/WxSysUserLoginQuery.java | 29 + .../portal/api/sysuser/wx/WxSysUserVo.java | 38 + .../portal/api/sysuserrole/SysUserRole.java | 34 + .../api/sysuserrole/SysUserRoleDto.java | 32 + .../api/sysuserrole/SysUserRoleFeign.java | 74 ++ .../sysuserrole/SysUserRoleFeignFallback.java | 81 ++ .../api/sysuserrole/SysUserRoleQuery.java | 32 + .../portal/api/sysuserrole/SysUserRoleVo.java | 32 + .../portal/api/pszxpfsj/Pszxpfsj.java | 94 ++ .../api/pszxpfsj/PszxpfsjDetailsVo.java | 95 ++ .../portal/api/pszxpfsj/PszxpfsjDto.java | 95 ++ .../PszxpfsjFeign.java} | 32 +- .../PszxpfsjFeignFallback.java} | 30 +- .../portal/api/pszxpfsj/PszxpfsjQuery.java | 93 ++ .../portal/api/pszxpfsj/PszxpfsjVo.java | 95 ++ .../PurchaseRequisition.java | 4 + .../PurchaseRequisitionDetailsVo.java | 4 + .../PurchaseRequisitionDto.java | 4 + .../PurchaseRequisitionFeign.java | 2 +- .../PurchaseRequisitionFeignFallback.java | 2 +- .../PurchaseRequisitionQuery.java | 16 +- .../PurchaseRequisitionVo.java | 6 + .../supplierbankinfo/SupplierBankInfo.java | 10 +- .../SupplierBankInfoDetailsVo.java | 12 +- .../supplierbankinfo/SupplierBankInfoDto.java | 12 +- .../SupplierBankInfoFeign.java | 2 +- .../SupplierBankInfoFeignFallback.java | 3 +- .../SupplierBankInfoQuery.java | 4 - .../supplierbankinfo/SupplierBankInfoVo.java | 4 - .../SupplierContractInfo.java | 70 + .../SupplierContractInfoDetailsVo.java | 71 ++ .../SupplierContractInfoDto.java | 72 ++ .../SupplierContractInfoFeign.java | 78 ++ .../SupplierContractInfoFeignFallback.java | 72 ++ .../SupplierContractInfoQuery.java | 65 + .../SupplierContractInfoVo.java | 71 ++ .../api/supplierindex/SupplierIndex.java | 64 + .../supplierindex/SupplierIndexDetailsVo.java | 65 + .../api/supplierindex/SupplierIndexDto.java | 68 + .../api/supplierindex/SupplierIndexFeign.java | 85 ++ .../SupplierIndexFeignFallback.java | 82 ++ .../api/supplierindex/SupplierIndexQuery.java | 63 + .../api/supplierindex/SupplierIndexVo.java | 65 + .../api/supplierinfo/SupplierInfoDto.java | 54 +- .../SysOrganizationDetailsVo.java | 83 -- .../sysorganization/SysOrganizationDto.java | 83 -- .../sysorganization/SysOrganizationQuery.java | 81 -- .../sysorganization/SysOrganizationVo.java | 83 -- .../supervise-portal-biz/pom.xml | 8 +- .../supervise/portal/PortalApplication.java | 4 +- .../portal/biz/productnum/ProductNumRest.java | 4 +- .../biz/productnum/ProductNumService.java | 16 +- .../portal/biz/pszxpfsj/PszxpfsjMapper.java | 88 ++ .../portal/biz/pszxpfsj/PszxpfsjMapper.xml | 71 ++ .../portal/biz/pszxpfsj/PszxpfsjRest.java | 107 ++ .../portal/biz/pszxpfsj/PszxpfsjService.java | 360 ++++++ .../PurchaseRequisitionMapper.java | 3 + .../PurchaseRequisitionMapper.xml | 2 +- .../PurchaseRequisitionRest.java | 97 +- .../PurchaseRequisitionService.java | 217 +++- .../PurchaseRequisitionProMapper.java | 2 +- .../PurchaseRequisitionStoreMapper.java | 55 + .../PurchaseRequisitionStoreMapper.xml | 5 + .../PurchaseRequisitionStoreRest.java | 100 ++ .../PurchaseRequisitionStoreService.java | 100 ++ .../PurchaseRequisitionTobaccoMapper.java | 61 + .../PurchaseRequisitionTobaccoMapper.xml | 25 + .../PurchaseRequisitionTobaccoRest.java | 107 ++ .../PurchaseRequisitionTobaccoService.java | 311 +++++ ...rchaseRequisitionTobaccoDetailsMapper.java | 59 + ...urchaseRequisitionTobaccoDetailsMapper.xml | 19 + ...PurchaseRequisitionTobaccoDetailsRest.java | 108 ++ ...chaseRequisitionTobaccoDetailsService.java | 178 +++ .../biz/salesdata/SalesDataService.java | 4 +- .../SupplierBankInfoMapper.java | 13 + .../SupplierBankInfoMapper.xml | 17 + .../SupplierBankInfoRest.java | 10 +- .../SupplierBankInfoService.java | 124 +- .../SupplierContractInfoMapper.java | 75 ++ .../SupplierContractInfoMapper.xml | 24 + .../SupplierContractInfoRest.java | 100 ++ .../SupplierContractInfoService.java | 115 ++ .../biz/supplierindex/SupplierIndex.java | 15 - .../supplierindex/SupplierIndexMapper.java | 73 +- .../biz/supplierindex/SupplierIndexMapper.xml | 33 + .../biz/supplierindex/SupplierIndexRest.java | 153 +++ .../supplierindex/SupplierIndexService.java | 78 +- .../biz/sysfunction/SysFunctionMapper.java | 59 + .../biz/sysfunction/SysFunctionMapper.xml | 63 + .../biz/sysfunction/SysFunctionRest.java | 195 +++ .../biz/sysfunction/SysFunctionService.java | 237 ++++ .../portal/biz/sysmenu/SysMenuMapper.java | 75 ++ .../portal/biz/sysmenu/SysMenuMapper.xml | 62 + .../portal/biz/sysmenu/SysMenuRest.java | 227 ++++ .../portal/biz/sysmenu/SysMenuService.java | 412 ++++++ .../biz/sysmenurole/SysMenuRoleMapper.java | 47 + .../biz/sysmenurole/SysMenuRoleMapper.xml | 33 + .../biz/sysmenurole/SysMenuRoleRest.java | 115 ++ .../biz/sysmenurole/SysMenuRoleService.java | 168 +++ .../SysOrganizationMapper.java | 140 +- .../sysorganization/SysOrganizationMapper.xml | 225 +++- .../sysorganization/SysOrganizationRest.java | 458 +++++-- .../SysOrganizationService.java | 559 ++++++-- .../portal/biz/syspost/SysPostMapper.java | 68 + .../portal/biz/syspost/SysPostMapper.xml | 44 + .../portal/biz/syspost/SysPostRest.java | 131 ++ .../portal/biz/syspost/SysPostService.java | 144 +++ .../portal/biz/sysrole/SysRoleMapper.java | 62 + .../portal/biz/sysrole/SysRoleMapper.xml | 93 ++ .../portal/biz/sysrole/SysRoleRest.java | 153 +++ .../portal/biz/sysrole/SysRoleService.java | 165 +++ .../SysRoleFunctionMapper.java | 43 + .../sysrolefunction/SysRoleFunctionMapper.xml | 13 + .../sysrolefunction/SysRoleFunctionRest.java | 114 ++ .../SysRoleFunctionService.java | 96 ++ .../portal/biz/syssource/SysSourceMapper.java | 56 + .../portal/biz/syssource/SysSourceMapper.xml | 45 + .../portal/biz/syssource/SysSourceRest.java | 120 ++ .../biz/syssource/SysSourceService.java | 176 +++ .../SysSourceFunctionMapper.java | 58 + .../SysSourceFunctionMapper.xml | 43 + .../SysSourceFunctionRest.java | 88 ++ .../SysSourceFunctionService.java | 115 ++ .../syssourcemenu/SysSourceMenuMapper.java | 60 + .../biz/syssourcemenu/SysSourceMenuMapper.xml | 45 + .../biz/syssourcemenu/SysSourceMenuRest.java | 88 ++ .../syssourcemenu/SysSourceMenuService.java | 112 ++ .../syssourcerole/SysSourceRoleMapper.java | 43 + .../biz/syssourcerole/SysSourceRoleMapper.xml | 13 + .../biz/syssourcerole/SysSourceRoleRest.java | 114 ++ .../syssourcerole/SysSourceRoleService.java | 96 ++ .../biz/sysstaffinfo/SysStaffinfoMapper.java | 125 ++ .../biz/sysstaffinfo/SysStaffinfoMapper.xml | 379 ++++++ .../biz/sysstaffinfo/SysStaffinfoRest.java | 203 +++ .../biz/sysstaffinfo/SysStaffinfoService.java | 745 +++++++++++ .../biz/sysstafforg/SysStaffOrgMapper.java | 109 ++ .../biz/sysstafforg/SysStaffOrgMapper.xml | 111 ++ .../biz/sysstafforg/SysStaffOrgRest.java | 147 +++ .../biz/sysstafforg/SysStaffOrgService.java | 306 +++++ .../biz/sysstaffpost/SysStaffPostMapper.java | 64 + .../biz/sysstaffpost/SysStaffPostMapper.xml | 60 + .../biz/sysstaffpost/SysStaffPostRest.java | 110 ++ .../biz/sysstaffpost/SysStaffPostService.java | 142 +++ .../portal/biz/sysuser/SysUserMapper.java | 187 +++ .../portal/biz/sysuser/SysUserMapper.xml | 353 ++++++ .../portal/biz/sysuser/SysUserRest.java | 550 ++++++++ .../portal/biz/sysuser/SysUserService.java | 1124 +++++++++++++++++ .../biz/sysuser/app/AppSysUserRest.java | 412 ++++++ .../portal/biz/sysuser/wx/WxSysUserRest.java | 365 ++++++ .../biz/sysuserrole/SysUserRoleMapper.java | 53 + .../biz/sysuserrole/SysUserRoleMapper.xml | 31 + .../biz/sysuserrole/SysUserRoleRest.java | 113 ++ .../biz/sysuserrole/SysUserRoleService.java | 123 ++ .../src/main/resources/cgdd-tmpl/cgdd.xls | Bin 0 -> 24064 bytes yxt_supervise/supervise-system/pom.xml | 24 + .../supervise-system-api/pom.xml | 19 + .../supervise-system-biz/pom.xml | 19 + 321 files changed, 25936 insertions(+), 721 deletions(-) create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java rename yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/{supervise/portal/api/sysorganization/SysOrganization.java => anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java} (50%) create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionTreeVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenu.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuTreeVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRole.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/AppContactSysOrganizationVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgListVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPost.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostListVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunction.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSource.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunction.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenu.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRole.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/AppContactsDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxBase64Query.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxSysInfoQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrg.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPost.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUser.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserRoleQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppMySysUserInfo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppUserOrgInfoVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxMySysUserInfoVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserLoginQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRole.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/Pszxpfsj.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDto.java rename yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/{sysorganization/SysOrganizationFeign.java => pszxpfsj/PszxpfsjFeign.java} (74%) rename yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/{sysorganization/SysOrganizationFeignFallback.java => pszxpfsj/PszxpfsjFeignFallback.java} (67%) create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndex.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDetailsVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDto.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeign.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeignFallback.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexQuery.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexVo.java delete mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDetailsVo.java delete mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDto.java delete mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationQuery.java delete mode 100644 yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationVo.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoService.java delete mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndex.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/app/AppSysUserRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/wx/WxSysUserRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.xml create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleRest.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleService.java create mode 100644 yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/cgdd-tmpl/cgdd.xls create mode 100644 yxt_supervise/supervise-system/pom.xml create mode 100644 yxt_supervise/supervise-system/supervise-system-api/pom.xml create mode 100644 yxt_supervise/supervise-system/supervise-system-biz/pom.xml diff --git a/yxt_supervise/pom.xml b/yxt_supervise/pom.xml index 50cd2d9b..9c4d4b31 100644 --- a/yxt_supervise/pom.xml +++ b/yxt_supervise/pom.xml @@ -13,6 +13,7 @@ gateway supervise-portal supervise-supplychain + supervise-system pom diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java new file mode 100644 index 00000000..216def7b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStore.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitionstore; + +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: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStore.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStore
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息", description = "采购订单商品信息") +@TableName("purchase_requisition_store") +public class PurchaseRequisitionStore extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("关联表sid") + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yczbh; // 卷烟代码 + @ApiModelProperty("门店代码") + private String storeCode; // 门店代码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("批次") + private String pc; // 批次 + @ApiModelProperty("明细总金额") + private String detailPrice; // 明细总金额 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java new file mode 100644 index 00000000..5dd502e6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDetailsVo.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitionstore; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreVo.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreVo
+ * Description: 采购订单商品信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 视图数据详情", description = "采购订单商品信息 视图数据详情") +public class PurchaseRequisitionStoreDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yczbh; // 卷烟代码 + @ApiModelProperty("门店代码") + private String storeCode; // 门店代码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("批次") + private String pc; // 批次 + @ApiModelProperty("明细总金额") + private String detailPrice; // 明细总金额 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java new file mode 100644 index 00000000..e3d9f281 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreDto.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitionstore; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreDto.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreDto
+ * Description: 采购订单商品信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 数据传输对象", description = "采购订单商品信息 数据传输对象") +public class PurchaseRequisitionStoreDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yczbh; // 卷烟代码 + @ApiModelProperty("门店代码") + private String storeCode; // 门店代码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("批次") + private String pc; // 批次 + @ApiModelProperty("明细总金额") + private String detailPrice; // 明细总金额 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java new file mode 100644 index 00000000..0e6cbc94 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitionstore; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreFeign.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreFeign
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单商品信息") +@FeignClient( + contextId = "yxt-supervise-PurchaseRequisitionStore", + name = "yxt-supervise", + path = "v1/purchaserequisitionstore", + fallback = PurchaseRequisitionStoreFeignFallback.class) +public interface PurchaseRequisitionStoreFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody PurchaseRequisitionStoreDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java new file mode 100644 index 00000000..d3c44ee9 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitionstore; + +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; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreFeignFallback
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class PurchaseRequisitionStoreFeignFallback implements PurchaseRequisitionStoreFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口yxt-supervise/purchaserequisitionstore/listPage无法访问"); + } + + @Override + public ResultBean save(PurchaseRequisitionStoreDto dto){ + return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitionstore/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitionstore/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口yxt-supervise/purchaserequisitionstore/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java new file mode 100644 index 00000000..f8452ddf --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreQuery.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitionstore; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreQuery.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreQuery
+ * Description: 采购订单商品信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 查询条件", description = "采购订单商品信息 查询条件") +public class PurchaseRequisitionStoreQuery implements Query { + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yczbh; // 卷烟代码 + @ApiModelProperty("门店代码") + private String storeCode; // 门店代码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("批次") + private String pc; // 批次 + @ApiModelProperty("明细总金额") + private String detailPrice; // 明细总金额 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java new file mode 100644 index 00000000..de78561f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreVo.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitionstore; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreVo.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreVo
+ * Description: 采购订单商品信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 视图数据对象", description = "采购订单商品信息 视图数据对象") +public class PurchaseRequisitionStoreVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yczbh; // 卷烟代码 + @ApiModelProperty("门店代码") + private String storeCode; // 门店代码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("批次") + private String pc; // 批次 + @ApiModelProperty("明细总金额") + private String detailPrice; // 明细总金额 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java new file mode 100644 index 00000000..5357ca39 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobacco.java @@ -0,0 +1,104 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobacco; + +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: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobacco.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表", description = "采购订单表") +@TableName("purchase_requisition_tobacco") +public class PurchaseRequisitionTobacco extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期(填单日期)") + private String purchaseDate; // 采购日期(填单日期) + @ApiModelProperty("到货日期") + private String arrivalDate; // 到货日期 + @ApiModelProperty("采购组织名称(默认36524集团)") + private String purchasingOrgName; // 采购组织名称(默认36524集团) + @ApiModelProperty("采购组织编码(36524)") + private String purchasingOrgCode; // 采购组织编码(36524) + @ApiModelProperty("采购部门名称(默认生活通)") + private String purchasingDeptCode; // 采购部门名称(默认生活通) + @ApiModelProperty("采购部门编码(默认生活通编码)") + private String purchasingDeptName; // 采购部门编码(默认生活通编码) + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("供应商唯一编码") + private String supplierOnlyCode; // 供应商唯一编码 + @ApiModelProperty("物流公司名称(和供应商相同)") + private String logisticsCompanyName; // 物流公司名称(和供应商相同) + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition; // 仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode; // 仓位code + @ApiModelProperty("监管0未审核，1审核通过，2审核不通过") + private String purchaseState; // 监管0未审核，1审核通过，2审核不通过 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核，1审核通过，2审核不通过") + private String bankState; // 银行0未审核，1审核通过，2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("完成状态") + private String completionStatus; // 完成状态 + @ApiModelProperty("完成状态Key") + private String completionStatusKey; // 完成状态Key + @ApiModelProperty("填单人code") + private String tdrCode; + @ApiModelProperty("填单人姓名") + private String tdrName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java new file mode 100644 index 00000000..342bb27b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDetailsVo.java @@ -0,0 +1,108 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobacco; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoVo.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo
+ * Description: 采购订单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 视图数据详情", description = "采购订单表 视图数据详情") +public class PurchaseRequisitionTobaccoDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期(填单日期)") + private String purchaseDate; // 采购日期(填单日期) + @ApiModelProperty("到货日期") + private String arrivalDate; // 到货日期 + @ApiModelProperty("采购组织名称(默认36524集团)") + private String purchasingOrgName; // 采购组织名称(默认36524集团) + @ApiModelProperty("采购组织编码(36524)") + private String purchasingOrgCode; // 采购组织编码(36524) + @ApiModelProperty("采购部门名称(默认生活通)") + private String purchasingDeptCode; // 采购部门名称(默认生活通) + @ApiModelProperty("采购部门编码(默认生活通编码)") + private String purchasingDeptName; // 采购部门编码(默认生活通编码) + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("供应商唯一编码") + private String supplierOnlyCode; // 供应商唯一编码 + @ApiModelProperty("物流公司名称(和供应商相同)") + private String logisticsCompanyName; // 物流公司名称(和供应商相同) + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition; // 仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode; // 仓位code + @ApiModelProperty("监管0未审核，1审核通过，2审核不通过") + private String purchaseState; // 监管0未审核，1审核通过，2审核不通过 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核，1审核通过，2审核不通过") + private String bankState; // 银行0未审核，1审核通过，2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("完成状态") + private String completionStatus; // 完成状态 + @ApiModelProperty("完成状态Key") + private String completionStatusKey; // 完成状态Key + @ApiModelProperty("填单人code") + private String tdrCode; + @ApiModelProperty("填单人姓名") + private String tdrName; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java new file mode 100644 index 00000000..346e20fc --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoDto.java @@ -0,0 +1,108 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobacco; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDto.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoDto
+ * Description: 采购订单表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 数据传输对象", description = "采购订单表 数据传输对象") +public class PurchaseRequisitionTobaccoDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期(填单日期)") + private String purchaseDate; // 采购日期(填单日期) + @ApiModelProperty("到货日期") + private String arrivalDate; // 到货日期 + @ApiModelProperty("采购组织名称(默认36524集团)") + private String purchasingOrgName; // 采购组织名称(默认36524集团) + @ApiModelProperty("采购组织编码(36524)") + private String purchasingOrgCode; // 采购组织编码(36524) + @ApiModelProperty("采购部门名称(默认生活通)") + private String purchasingDeptCode; // 采购部门名称(默认生活通) + @ApiModelProperty("采购部门编码(默认生活通编码)") + private String purchasingDeptName; // 采购部门编码(默认生活通编码) + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("供应商唯一编码") + private String supplierOnlyCode; // 供应商唯一编码 + @ApiModelProperty("物流公司名称(和供应商相同)") + private String logisticsCompanyName; // 物流公司名称(和供应商相同) + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition; // 仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode; // 仓位code + @ApiModelProperty("监管0未审核，1审核通过，2审核不通过") + private String purchaseState; // 监管0未审核，1审核通过，2审核不通过 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核，1审核通过，2审核不通过") + private String bankState; // 银行0未审核，1审核通过，2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("完成状态") + private String completionStatus; // 完成状态 + @ApiModelProperty("完成状态Key") + private String completionStatusKey; // 完成状态Key + @ApiModelProperty("填单人code") + private String tdrCode; + @ApiModelProperty("填单人姓名") + private String tdrName; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java new file mode 100644 index 00000000..7c2aa0a1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobacco; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoFeign.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoFeign
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单表") +@FeignClient( + contextId = "yxt-supervise-PurchaseRequisitionTobacco", + name = "yxt-supervise", + path = "v1/purchaserequisitiontobacco", + fallback = PurchaseRequisitionTobaccoFeignFallback.class) +public interface PurchaseRequisitionTobaccoFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody PurchaseRequisitionTobaccoDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java new file mode 100644 index 00000000..85bf581c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobacco; + +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; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoFeignFallback
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class PurchaseRequisitionTobaccoFeignFallback implements PurchaseRequisitionTobaccoFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口yxt-supervise/purchaserequisitiontobacco/listPage无法访问"); + } + + @Override + public ResultBean save(PurchaseRequisitionTobaccoDto dto){ + return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobacco/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobacco/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口yxt-supervise/purchaserequisitiontobacco/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java new file mode 100644 index 00000000..d469fa5e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoQuery.java @@ -0,0 +1,106 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobacco; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoQuery.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoQuery
+ * Description: 采购订单表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 查询条件", description = "采购订单表 查询条件") +public class PurchaseRequisitionTobaccoQuery implements Query { + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期(填单日期)") + private String purchaseDate; // 采购日期(填单日期) + @ApiModelProperty("到货日期") + private String arrivalDate; // 到货日期 + @ApiModelProperty("采购组织名称(默认36524集团)") + private String purchasingOrgName; // 采购组织名称(默认36524集团) + @ApiModelProperty("采购组织编码(36524)") + private String purchasingOrgCode; // 采购组织编码(36524) + @ApiModelProperty("采购部门名称(默认生活通)") + private String purchasingDeptCode; // 采购部门名称(默认生活通) + @ApiModelProperty("采购部门编码(默认生活通编码)") + private String purchasingDeptName; // 采购部门编码(默认生活通编码) + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("供应商唯一编码") + private String supplierOnlyCode; // 供应商唯一编码 + @ApiModelProperty("物流公司名称(和供应商相同)") + private String logisticsCompanyName; // 物流公司名称(和供应商相同) + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition; // 仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode; // 仓位code + @ApiModelProperty("监管0未审核，1审核通过，2审核不通过") + private String purchaseState; // 监管0未审核，1审核通过，2审核不通过 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核，1审核通过，2审核不通过") + private String bankState; // 银行0未审核，1审核通过，2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("完成状态") + private String completionStatus; // 完成状态 + @ApiModelProperty("完成状态Key") + private String completionStatusKey; // 完成状态Key + @ApiModelProperty("填单人code") + private String tdrCode; + @ApiModelProperty("填单人姓名") + private String tdrName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java new file mode 100644 index 00000000..53257141 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoVo.java @@ -0,0 +1,108 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobacco; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoVo.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoVo
+ * Description: 采购订单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 视图数据对象", description = "采购订单表 视图数据对象") +public class PurchaseRequisitionTobaccoVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("单号") + private String code; // 单号 + @ApiModelProperty("采购员姓名") + private String buyerName; // 采购员姓名 + @ApiModelProperty("采购员编码") + private String buyerCode; // 采购员编码 + @ApiModelProperty("采购日期(填单日期)") + private String purchaseDate; // 采购日期(填单日期) + @ApiModelProperty("到货日期") + private String arrivalDate; // 到货日期 + @ApiModelProperty("采购组织名称(默认36524集团)") + private String purchasingOrgName; // 采购组织名称(默认36524集团) + @ApiModelProperty("采购组织编码(36524)") + private String purchasingOrgCode; // 采购组织编码(36524) + @ApiModelProperty("采购部门名称(默认生活通)") + private String purchasingDeptCode; // 采购部门名称(默认生活通) + @ApiModelProperty("采购部门编码(默认生活通编码)") + private String purchasingDeptName; // 采购部门编码(默认生活通编码) + @ApiModelProperty("供应商名称") + private String supplierName; // 供应商名称 + @ApiModelProperty("供应商编码") + private String supplierCode; // 供应商编码 + @ApiModelProperty("供应商唯一编码") + private String supplierOnlyCode; // 供应商唯一编码 + @ApiModelProperty("物流公司名称(和供应商相同)") + private String logisticsCompanyName; // 物流公司名称(和供应商相同) + @ApiModelProperty("物流公司编码") + private String logisticsCompanyCode; // 物流公司编码 + @ApiModelProperty("单据到效期") + private String expiryDate; // 单据到效期 + @ApiModelProperty("仓位") + private String warehousePosition; // 仓位 + @ApiModelProperty("仓位code") + private String warehousePositionCode; // 仓位code + @ApiModelProperty("监管0未审核，1审核通过，2审核不通过") + private String purchaseState; // 监管0未审核，1审核通过，2审核不通过 + @ApiModelProperty("监管审批意见") + private String purchaseRemarks; // 监管审批意见 + @ApiModelProperty("银行0未审核，1审核通过，2审核不通过") + private String bankState; // 银行0未审核，1审核通过，2审核不通过 + @ApiModelProperty("银行审批意见") + private String bankRemarks; // 银行审批意见 + @ApiModelProperty("完成状态") + private String completionStatus; // 完成状态 + @ApiModelProperty("完成状态Key") + private String completionStatusKey; // 完成状态Key + @ApiModelProperty("填单人code") + private String tdrCode; + @ApiModelProperty("填单人姓名") + private String tdrName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganization.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java similarity index 50% rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganization.java rename to yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java index 5fe15dc6..779f41d9 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganization.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetails.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.supervise.portal.api.sysorganization; +package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -32,51 +32,46 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: yxt_supervise(宇信通监管)
- * File: SysOrganization.java
- * Class: com.supervise.api.sysorganization.SysOrganization
- * Description: 组织机构表.
+ * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetails.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails
+ * Description: 采购订单表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
+ * Makedate: 2022-12-28 11:37:54
* - * @author dongjianzhao + * @author liupopo * @version 1.0 * @since 1.0 */ @Data -@ApiModel(value = "组织机构表", description = "组织机构表") -@TableName("sys_organization") -public class SysOrganization extends BaseEntity { +@ApiModel(value = "采购订单表", description = "采购订单表") +@TableName("purchase_requisition_tobacco_details") +public class PurchaseRequisitionTobaccoDetails extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("部门/组织名称") - private String name; // 部门/组织名称 - @ApiModelProperty("父(部门/组织) sid") - private String psid; // 父(部门/组织) sid - @ApiModelProperty("联系电话") - private String linkPhone; // 联系电话 - @ApiModelProperty("部门sid全路径") - private String orgSidPath; // 部门sid全路径 - @ApiModelProperty("排序") - private Integer sort; // 排序 - @ApiModelProperty("地址") - private String addrs; // 地址 - @ApiModelProperty("地理位置经纬度") - private String jwd; // 地理位置经纬度 - @ApiModelProperty("部门编码") - private String orgCode; // 部门编码 - @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") - private String orgShortName; // 部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母）） - @ApiModelProperty("联系人") - private String linkPerson; // 联系人 - @ApiModelProperty("是否是独立法人:0是，1否") - private Integer isDept; // 是否是独立法人:0是，1否 - @ApiModelProperty("是否是公司：0否，1是") - private Integer isOrg; // 是否是公司：0否，1是 - @ApiModelProperty("组织属性key") - private String orgAttributeKey; // 组织属性key - @ApiModelProperty("组织属性value") - private String orgAttributeValue; // 组织属性value - + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("关联表sid") + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yCode; // 卷烟代码 + @ApiModelProperty("门店名称编码") + private String storeCode; // 门店名称编码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("批发价") + private String pfj; // 批发价 + @ApiModelProperty("要货量") + private String yhl; // 要货量 + @ApiModelProperty("订单量") + private String ddl; // 订单量 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("厂家名称") + private String cjmc; // 厂家名称 + @ApiModelProperty("零售指导价") + private String lszdj; // 零售指导价 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java new file mode 100644 index 00000000..7f42eb09 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDetailsVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsVo.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsVo
+ * Description: 采购订单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 视图数据详情", description = "采购订单表 视图数据详情") +public class PurchaseRequisitionTobaccoDetailsDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("关联表sid") + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yCode; // 卷烟代码 + @ApiModelProperty("门店名称编码") + private String storeCode; // 门店名称编码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("批发价") + private String pfj; // 批发价 + @ApiModelProperty("要货量") + private String yhl; // 要货量 + @ApiModelProperty("订单量") + private String ddl; // 订单量 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("厂家名称") + private String cjmc; // 厂家名称 + @ApiModelProperty("零售指导价") + private String lszdj; // 零售指导价 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java new file mode 100644 index 00000000..57039fb0 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsDto.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsDto.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsDto
+ * Description: 采购订单表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 数据传输对象", description = "采购订单表 数据传输对象") +public class PurchaseRequisitionTobaccoDetailsDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("关联表sid") + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yCode; // 卷烟代码 + @ApiModelProperty("门店名称编码") + private String storeCode; // 门店名称编码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("批发价") + private String pfj; // 批发价 + @ApiModelProperty("要货量") + private String yhl; // 要货量 + @ApiModelProperty("订单量") + private String ddl; // 订单量 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("厂家名称") + private String cjmc; // 厂家名称 + @ApiModelProperty("零售指导价") + private String lszdj; // 零售指导价 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java new file mode 100644 index 00000000..b9f02b6f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsFeign.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsFeign
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单表") +@FeignClient( + contextId = "yxt-supervise-PurchaseRequisitionTobaccoDetails", + name = "yxt-supervise", + path = "v1/purchaserequisitiontobaccodetails", + fallback = PurchaseRequisitionTobaccoDetailsFeignFallback.class) +public interface PurchaseRequisitionTobaccoDetailsFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody PurchaseRequisitionTobaccoDetailsDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java new file mode 100644 index 00000000..56a37d6b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails; + +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; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsFeignFallback
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class PurchaseRequisitionTobaccoDetailsFeignFallback implements PurchaseRequisitionTobaccoDetailsFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/listPage无法访问"); + } + + @Override + public ResultBean save(PurchaseRequisitionTobaccoDetailsDto dto){ + return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口yxt-supervise/purchaserequisitiontobaccodetails/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java new file mode 100644 index 00000000..38dde960 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsQuery.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsQuery.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsQuery
+ * Description: 采购订单表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 查询条件", description = "采购订单表 查询条件") +public class PurchaseRequisitionTobaccoDetailsQuery implements Query { + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("关联表sid") + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yCode; // 卷烟代码 + @ApiModelProperty("门店名称编码") + private String storeCode; // 门店名称编码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("批发价") + private String pfj; // 批发价 + @ApiModelProperty("要货量") + private String yhl; // 要货量 + @ApiModelProperty("订单量") + private String ddl; // 订单量 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("厂家名称") + private String cjmc; // 厂家名称 + @ApiModelProperty("零售指导价") + private String lszdj; // 零售指导价 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java new file mode 100644 index 00000000..38148f8c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsVo.java @@ -0,0 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsVo.java
+ * Class: com.yxt.supervise.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsVo
+ * Description: 采购订单表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单表 视图数据对象", description = "采购订单表 视图数据对象") +public class PurchaseRequisitionTobaccoDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("关联表sid") + private String mainSid; // 关联表sid + @ApiModelProperty("卷烟代码") + private String yCode; // 卷烟代码 + @ApiModelProperty("门店名称编码") + private String storeCode; // 门店名称编码 + @ApiModelProperty("门店名称") + private String storeName; // 门店名称 + @ApiModelProperty("批发价") + private String pfj; // 批发价 + @ApiModelProperty("要货量") + private String yhl; // 要货量 + @ApiModelProperty("订单量") + private String ddl; // 订单量 + @ApiModelProperty("金额") + private String price; // 金额 + @ApiModelProperty("厂家名称") + private String cjmc; // 厂家名称 + @ApiModelProperty("零售指导价") + private String lszdj; // 零售指导价 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java new file mode 100644 index 00000000..b6a40666 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunction.java @@ -0,0 +1,49 @@ +package com.yxt.anrui.portal.api.sysfunction; + +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: SysFunction.java
+ * Class: com.yxt.anrui.portal.api.sysfunction.SysFunction
+ * 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_function") +@Data +public class SysFunction extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("功能名称") + private String name; + + @ApiModelProperty("层级") + private Integer level; + + @ApiModelProperty("父级sid") + private String parentSid; + + @ApiModelProperty("接口地址") + private String actionUrl; + + @ApiModelProperty("模块名称") + private String controllerName; + + @ApiModelProperty("移动端按钮id") + private String funId; + + @ApiModelProperty("是否手机端权限0否，1是") + private String phoneFunction; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java new file mode 100644 index 00000000..1c52df81 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionDto.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.portal.api.sysfunction; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionDto.java
+ * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionDto
+ * 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 SysFunctionDto implements Dto { + + + @ApiModelProperty("功能名称") + private String name; + + @ApiModelProperty("层级") + private Integer level; + + @ApiModelProperty("父级sid") + private String parentSid; + + @ApiModelProperty("接口地址") + private String actionUrl; + + @ApiModelProperty("模块名称") + private String controllerName; + @ApiModelProperty("模块sid") + private String sourceSid; + + @ApiModelProperty("移动端按钮id") + private String funId; + + @ApiModelProperty("是否手机端权限0否，1是") + private String phoneFunction; + @ApiModelProperty("备注") + private String remarks ; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java new file mode 100644 index 00000000..04ef1058 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java @@ -0,0 +1,88 @@ +package com.yxt.anrui.portal.api.sysfunction; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionFeign.java
+ * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionFeign
+ * 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 = "功能") +@FeignClient( + contextId = "supervise-portal-SysFunction", + name = "supervise-portal", + path = "v1/sysfunction", + fallback = SysFunctionFeignFallback.class) +public interface SysFunctionFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("功能管理不分页查询全部 树形") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysFunctionQuery query); + + @ApiOperation("根据角色sid条件查询所有数据列表 树形") + @PostMapping("/listAllByRoleSid") + public ResultBean> listAllByRoleSid(@RequestBody SysFunctionQuery query); + + /** + * 功能列表接口 + * + * @param query + * @return + */ + @ApiOperation("查询所有数据列表 根据资源归类") + @PostMapping("/listAllVoForSource") + public ResultBean> listAllVoForSource(@RequestBody SysFunctionQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysFunctionDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysFunctionDto dto,@PathVariable("sid") String sid); + + @ApiOperation("修改功能的是否可用的状态") + @PostMapping("/updateIsEnable/{sid}/{isEnable}") + public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + @ApiOperation("删除记录") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + @ApiOperation("获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java new file mode 100644 index 00000000..1dfc5351 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java @@ -0,0 +1,92 @@ +package com.yxt.anrui.portal.api.sysfunction; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionFeignFallback
+ * 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 + */ +@Component +public class SysFunctionFeignFallback implements SysFunctionFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysfunction/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysFunctionQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysfunction/listAll无法访问"); + } + + @Override + public ResultBean> listAllByRoleSid(SysFunctionQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysfunction/listAllByRoleSid无法访问"); + } + + @Override + public ResultBean> listAllVoForSource(SysFunctionQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysfunction/listAllVoForSource无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysfunction/list无法访问"); + } + + @Override + public ResultBean save(SysFunctionDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysfunction/save无法访问"); + } + + @Override + public ResultBean update(SysFunctionDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysfunction/update无法访问"); + } + + @Override + public ResultBean updateIsEnable(String sid, Integer isEnable) { + return null; + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysfunction/del无法访问"); + } + + @Override + public ResultBean delBySids(String sids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysfunction/delBySids无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysfunction/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysfunction/fetchBySid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java new file mode 100644 index 00000000..648787b5 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionQuery.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.portal.api.sysfunction; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionQuery.java
+ * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionQuery
+ * 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 SysFunctionQuery implements Query { + + + @ApiModelProperty("功能名称") + private String name; + + @ApiModelProperty("层级") + private Integer level; + + @ApiModelProperty("父级sid") + private String parentSid; + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("接口地址") + private String actionUrl; + + @ApiModelProperty("模块名称") + private String controllerName; + + @ApiModelProperty("移动端按钮id") + private String funId; + + + @ApiModelProperty("是否手机端权限0否，1是") + private String phoneFunction; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionTreeVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionTreeVo.java new file mode 100644 index 00000000..88bab74e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionTreeVo.java @@ -0,0 +1,50 @@ +package com.yxt.anrui.portal.api.sysfunction; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionTreeVo.java
+ * 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 SysFunctionTreeVo implements Vo { + @ApiModelProperty("功能名称") + private String name; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("上级sid") + private String parentSid; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("资源名称") + private String sourceName; + @ApiModelProperty("url地址") + private String actionUrl; + @ApiModelProperty("功能根路径sid") + private String functionRootSid; + @ApiModelProperty("子功能") + private List children; + @ApiModelProperty("是否可用") + private String isEnable; + @ApiModelProperty("功能列表用，是否是资源层级1是，0不是") + private String isSource = "0"; + @ApiModelProperty("父级名称") + private String parentName; + @ApiModelProperty("说明") + private String remarks; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java new file mode 100644 index 00000000..7cbfbdad --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.portal.api.sysfunction; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionVo.java
+ * Class: com.yxt.anrui.portal.api.sysfunction.SysFunctionVo
+ * 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 SysFunctionVo implements Vo { + @ApiModelProperty("功能名称") + private String name; + @ApiModelProperty("父级sid") + private String parentSid; + @ApiModelProperty("父级名称") + private String parentName; + @ApiModelProperty("接口地址") + private String actionUrl; + @ApiModelProperty("模块名称") + private String controllerName; + @ApiModelProperty("是否手机端权限0否，1是") + private String phoneFunction; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("子集数据") + private List children; + @ApiModelProperty("是否选中 1未选中，0选中") + private String checked; + @ApiModelProperty("资源名称") + private String sourceName; + @ApiModelProperty("资源SId") + private String sourceSid; + @ApiModelProperty("是否可用") + private Integer isEnable; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java new file mode 100644 index 00000000..57e5cc03 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SaveListDto.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class SaveListDto implements Dto { + private static final long serialVersionUID = -8934344899751306457L; + + @ApiModelProperty("用户sid") + private String userSid; // 数据字典sid + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + + @ApiModelProperty("List") + private List listDtos; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java new file mode 100644 index 00000000..16f2f40c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMapping.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + +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: sysmapping(sysmapping)
+ * File: SysMapping.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMapping
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射", description = "数据映射") +@TableName("sys_mapping") +public class SysMapping extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java new file mode 100644 index 00000000..2078b99c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDetailsVo.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingVo.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo
+ * Description: sys_mapping 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 视图数据详情", description = "数据映射 视图数据详情") +public class SysMappingDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java new file mode 100644 index 00000000..500bbff1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingDto.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingDto.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingDto
+ * Description: sys_mapping 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 数据传输对象", description = "数据映射 数据传输对象") +public class SysMappingDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("用户sid") + private String userSid; // 数据字典sid + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java new file mode 100644 index 00000000..00e6e041 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeign.java @@ -0,0 +1,98 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingFeign.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeign
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "数据映射") +@FeignClient( + contextId = "supervise-portal-SysMapping", + name = "supervise-portal", + path = "v1/sysmapping", + fallback = SysMappingFeignFallback.class) +public interface SysMappingFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody SysMappingDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("新增映射") + @PostMapping("/saveMappingList") + @ResponseBody + public ResultBean saveMappingList(@RequestBody SaveListDto dto); + + @ApiOperation("根据条件查询详情") + @PostMapping("/selectMappingInfo") + @ResponseBody + public ResultBean selectMappingInfo(@RequestBody SysMappingInfoQuery query); + + @PostMapping("/selectMappingListInfo") + @ResponseBody + public ResultBean> selectMappingListInfo(@RequestBody SysMappingListInfoQuery query); + + @ApiOperation("根据条件查询详情批量") + @PostMapping("/selectMappingInfoBatch") + @ResponseBody + public ResultBean> selectMappingInfoBatch(@RequestBody List>> sysMappingInfoQuerys); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java new file mode 100644 index 00000000..972eba7b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingFeignFallback.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + +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; +import java.util.Map; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingFeignFallback
+ * Description: sys_mapping.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysMappingFeignFallback implements SysMappingFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口sysmapping/sysmapping/listPage无法访问"); + } + + @Override + public ResultBean save(SysMappingDto dto){ + return ResultBean.fireFail().setMsg("接口sysmapping/sysmapping/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口sysmapping/sysmapping/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口sysmapping/sysmapping/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean saveMappingList(SaveListDto dto) { + return null; + } + + @Override + public ResultBean selectMappingInfo(SysMappingInfoQuery query) { + return null; + } + + @Override + public ResultBean> selectMappingListInfo(SysMappingListInfoQuery query) { + return null; + } + + @Override + public ResultBean> selectMappingInfoBatch(List>> sysMappingInfoQuerys) { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java new file mode 100644 index 00000000..91a82748 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoQuery implements Query { + private static final long serialVersionUID = 5179141159925489016L; + + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + + @ApiModelProperty("数据key") + private String dictKey; // 数据key +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java new file mode 100644 index 00000000..6efbf245 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoQueryBatch.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoQueryBatch implements Query { + private static final long serialVersionUID = 5179141159925489016L; + + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + + @ApiModelProperty("数据key") + private String dictKey; // 数据key + /* @ApiModelProperty("编码") + private String fNumber; // 编码*/ +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java new file mode 100644 index 00000000..f6aa7a47 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingInfoVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingInfoVo implements Vo { + + + private static final long serialVersionUID = -4909774998558087805L; + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java new file mode 100644 index 00000000..5ed9c78a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListDto.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingDto.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingDto
+ * Description: sys_mapping 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 数据传输对象", description = "数据映射 数据传输对象") +public class SysMappingListDto implements Dto { + + private String sid; // sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java new file mode 100644 index 00000000..7c12e177 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingListInfoQuery.java @@ -0,0 +1,13 @@ +package com.yxt.anrui.portal.api.sysmapping; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class SysMappingListInfoQuery implements Query { + private static final long serialVersionUID = 2691844852742909158L; + + @ApiModelProperty("数据字典sid") + private String dictSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java new file mode 100644 index 00000000..52666564 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingQuery.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingQuery
+ * Description: sys_mapping 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 查询条件", description = "数据映射 查询条件") +public class SysMappingQuery implements Query { + + private static final long serialVersionUID = -546734185535363676L; + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + @ApiModelProperty("数据字典类别名称") + private String dictTypeName; // 数据字典类别名称 + @ApiModelProperty("数据key") + private String dictKey; // 数据key + @ApiModelProperty("数据value") + private String dictValue; // 数据value + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java new file mode 100644 index 00000000..1cd66077 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmapping/SysMappingVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.portal.api.sysmapping; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: sysmapping(sysmapping)
+ * File: SysMappingVo.java
+ * Class: com.yxt.anrui.portal.api.sysmapping.SysMappingVo
+ * Description: sys_mapping 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-26 10:50:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "数据映射 视图数据对象", description = "数据映射 视图数据对象") +public class SysMappingVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("数据字典sid") + private String dictSid; // 数据字典sid + @ApiModelProperty("映射来源，如CWXT等") + private String map_sourceKey; // 映射来源，如CWXT等 + @ApiModelProperty("映射来源，如财务系统等") + private String map_sourceValue; // 映射来源，如财务系统等 + @ApiModelProperty("映射实体，如付款单") + private String map_object; // 映射实体，如付款单 + @ApiModelProperty("映射项目类别，如应付类别") + private String map_item; // 映射项目类别，如应付类别 + @ApiModelProperty("项目key，如002") + private String map_itemKey; // 项目key，如002 + @ApiModelProperty("项目value，如外采") + private String map_itemValue; // 项目value，如外采 + + @ApiModelProperty("数据字典类别编码") + private String dictTypeCode; // 数据字典类别编码 + @ApiModelProperty("数据字典类别名称") + private String dictTypeName; // 数据字典类别名称 + @ApiModelProperty("数据key") + private String dictKey; // 数据key + @ApiModelProperty("数据value") + private String dictValue; // 数据value +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenu.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenu.java new file mode 100644 index 00000000..56f579de --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenu.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.portal.api.sysmenu; + +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: SysMenu.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenu
+ * 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") +@Data +public class SysMenu extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源sid") + private String sourceSid; + + @ApiModelProperty("是否显示,默认为1显示，0为不显示") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("上级sid") + private String pSid; + + @ApiModelProperty("前端页面路径重定向") + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty("前端页面别名") + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuDto.java new file mode 100644 index 00000000..acb99077 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuDto.java @@ -0,0 +1,72 @@ +package com.yxt.anrui.portal.api.sysmenu; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuDto.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuDto
+ * 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 SysMenuDto implements Dto { + + + private static final long serialVersionUID = -8143707488992909267L; + @ApiModelProperty(value = "菜单名称", required = true) + @NotBlank(message = "菜单名称不能为空") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty(value = "资源sid", required = true) + @NotBlank(message = "资源不能为空") + private String sourceSid; + + @ApiModelProperty(value = "是否显示,默认为1显示，0为不显示", required = true) + @NotBlank(message = "是否显示不能为空") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty(value = "上级sid", example = "0", required = true) + @NotBlank(message = "上级菜单不能为空") + private String pSid; + + @ApiModelProperty(value = "前端页面路径重定向", required = false) + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty(value = "前端页面别名", required = false) + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; + + @ApiModelProperty(value = "备注") + private String remarks; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeign.java new file mode 100644 index 00000000..92e86fdf --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeign.java @@ -0,0 +1,114 @@ +package com.yxt.anrui.portal.api.sysmenu; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuFeign.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeign
+ * 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 = "菜单表") +@FeignClient( + contextId = "supervise-portal-SysMenu", + name = "supervise-portal", + path = "v1/sysmenu", + fallback = SysMenuFeignFallback.class) +public interface SysMenuFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + +/* @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysMenuQuery query);*/ + + /** + * 菜单列表：根据资源归类 + * + * @param query + * @return + */ + @ApiOperation("菜单列表：根据资源归类") + @PostMapping("/listAllVoForSource") + public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query); + + @ApiOperation("根据资源sid查询所有数据列表 ") + @PostMapping("/sourcemenutree") + public ResultBean>> sourcemenutree(@RequestBody SysMenuQuery query); + + @ApiOperation("根据角色sid条件查询所有数据列表") + @PostMapping("/listAllByRoleSid") + public ResultBean> listAllByRoleSid(@RequestBody SysMenuQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysMenuDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid); + + /* @ApiOperation("修改保存") + @PostMapping("/updateSort/{sid}") + public ResultBean updateSort(@RequestBody SysMenuDto dto,@PathVariable("sid") String sid); + */ + + /** + * 修改是否可用的状态 + * + * @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); + + /* @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids);*/ + + /** + * 根据当前行sid删除菜单 + * + * @param sid 菜单sid + * @return + */ + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySids/{sid}") + public ResultBean delBySids(@PathVariable("sid") String sid); + + /* @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录 根据sid") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid);*/ +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeignFallback.java new file mode 100644 index 00000000..ba5bedac --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuFeignFallback.java @@ -0,0 +1,100 @@ +package com.yxt.anrui.portal.api.sysmenu; + +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; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuFeignFallback
+ * 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 + */ +@Component +public class SysMenuFeignFallback implements SysMenuFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/listPage无法访问"); + } + + /* @Override + public ResultBean> listAll(SysMenuQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/listAll无法访问"); + }*/ + + @Override + public ResultBean> listAllVoForSource(SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/listAllVoForSource无法访问"); + } + + @Override + public ResultBean>> sourcemenutree(SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/sourcemenutree无法访问"); + } + + @Override + public ResultBean> listAllByRoleSid(SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/listAllByRoleSid无法访问"); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/list无法访问"); + } + + @Override + public ResultBean save(SysMenuDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenu/save无法访问"); + } + + @Override + public ResultBean update(SysMenuDto dto, String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenu/update无法访问"); + } + + @Override + public ResultBean updateIsEnable(String sid, Integer isEnable) { + return null; + } + +/* @Override + public ResultBean del(String ids) { + + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenu/del无法访问"); + }*/ + + @Override + public ResultBean delBySids(String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenu/delBySids无法访问"); + } + + /*@Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenu/fetchBySid无法访问"); + }*/ +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuQuery.java new file mode 100644 index 00000000..0fccbb46 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuQuery.java @@ -0,0 +1,66 @@ +package com.yxt.anrui.portal.api.sysmenu; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuQuery.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery
+ * 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 SysMenuQuery implements Query { + + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("是否显示,默认为1显示，0为不显示") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("上级sid") + private String pSid; + + @ApiModelProperty("前端页面路径重定向") + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty("前端页面别名") + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuTreeVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuTreeVo.java new file mode 100644 index 00000000..3bf2c324 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuTreeVo.java @@ -0,0 +1,59 @@ +package com.yxt.anrui.portal.api.sysmenu; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo
+ * 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 SysMenuTreeVo implements Vo { + @ApiModelProperty("菜单名称") + private String name; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("排序号") + private Integer sortNo; + @ApiModelProperty("上级sid") + private String pSid; + @ApiModelProperty("上级菜单名称") + private String pName; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("资源名称") + private String sourceName; + @ApiModelProperty("菜单根路径sid") + private String menuRootSid; + @ApiModelProperty("pageUrl") + private String pageUrl; + @ApiModelProperty("menuUrl") + private String menuUrl; + @ApiModelProperty("menuUrl") + private String pageName; + @ApiModelProperty("iconUrl") + private String iconUrl; + @ApiModelProperty("菜单列表用，是否是资源层级1是，0不是") + private String isSource = "0"; + @ApiModelProperty("是否可用") + private String isEnable; + @ApiModelProperty(value = "备注") + private String remarks; + @ApiModelProperty("子菜单") + private List children; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuVo.java new file mode 100644 index 00000000..ea793871 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenu/SysMenuVo.java @@ -0,0 +1,74 @@ +package com.yxt.anrui.portal.api.sysmenu; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuVo.java
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo
+ * 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 SysMenuVo implements Vo { + + + @ApiModelProperty("菜单名称") + private String name; + + @ApiModelProperty("菜单路由路径(VUE)") + private String menuUrl; + + @ApiModelProperty("菜单对应的前端页面路径") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源sid") + private String sourceSid; + + @ApiModelProperty("是否显示,默认为1显示，0为不显示") + private String isShow; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("上级sid") + private String pSid; + @ApiModelProperty("上级名称") + private String pName; + @ApiModelProperty("sid") + private String sid; + + @ApiModelProperty("前端页面路径重定向") + private Integer pageUrlRedirect; + + @ApiModelProperty("前端页面名称（vue组件名）") + private String pageName; + + @ApiModelProperty("前端页面别名") + private String pageAliasName; + + @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）") + private String menuType; + @ApiModelProperty("子菜单") + private List children; + @ApiModelProperty("是否选中，1：未选中,0：选中") + private String checked; + @ApiModelProperty("资源名称") + private String sourceName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRole.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRole.java new file mode 100644 index 00000000..dcbd4c0d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRole.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.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; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java new file mode 100644 index 00000000..e5be54b5 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.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/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java new file mode 100644 index 00000000..0fad7970 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeign.java @@ -0,0 +1,67 @@ +package com.yxt.anrui.portal.api.sysmenurole; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeign
+ * 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 = "菜单与角色关联表") +@FeignClient( + contextId = "supervise-portal-SysMenuRole", + name = "supervise-portal", + path = "v1/sysmenurole", + fallback = SysMenuRoleFeignFallback.class) +public interface SysMenuRoleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysMenuRoleQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysMenuRoleDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid); + @ApiOperation("修改角色的菜单配置") + @PostMapping("/updateRoleAndMenu") + public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java new file mode 100644 index 00000000..f7751fb4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleFeignFallback.java @@ -0,0 +1,69 @@ +package com.yxt.anrui.portal.api.sysmenurole; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleFeignFallback
+ * 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 + */ +@Component +public class SysMenuRoleFeignFallback implements SysMenuRoleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenurole/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysMenuRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenurole/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenurole/list无法访问"); + } + + @Override + public ResultBean save(SysMenuRoleDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenurole/save无法访问"); + } + + @Override + public ResultBean update(SysMenuRoleDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenurole/update无法访问"); + } + + @Override + public ResultBean updateRoleAndMenu(SysMenuRoleDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenurole/updateRoleAndMenu无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysmenurole/del无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysmenurole/fetch无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java new file mode 100644 index 00000000..78d9b608 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleQuery.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.portal.api.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/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleVo.java new file mode 100644 index 00000000..6684020c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysmenurole/SysMenuRoleVo.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.portal.api.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/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/AppContactSysOrganizationVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/AppContactSysOrganizationVo.java new file mode 100644 index 00000000..a8a9d4ba --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/AppContactSysOrganizationVo.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/24 + */ +@ApiModel(value = "App通讯录组织架构") +@Data +public class AppContactSysOrganizationVo implements Vo { + + @ApiModelProperty("部门/组织sid") + private String sid; + + @ApiModelProperty("部门/组织名称|员工姓名") + private String name; + + @ApiModelProperty("员工数量") + private int staffNum; + + @ApiModelProperty("跳转类型：1、部门2、员工列表") + private Integer type; + + @ApiModelProperty("员工电话") + private String mobile; + + @ApiModelProperty("员工头像") + private String headImage; + + @ApiModelProperty("员工所在部门名称（路径）") + private String orgNamePath; + + @ApiModelProperty("员工职位") + private String position; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java new file mode 100644 index 00000000..d6314b55 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/QrCodeVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2020/11/3 16:19 + * @description + */ +@Data +public class QrCodeVo { + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("单位名称") + private String organizationName; + @ApiModelProperty("部门地址") + private String address; + @ApiModelProperty("二维码图片地址") + private String qrFilePath; + @ApiModelProperty(value = "部门sid") + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgListVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgListVo.java new file mode 100644 index 00000000..24e96309 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgListVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/2/14 11:45 + * @Description 员工所在部门下拉列表 + */ +@Data +public class SysOrgListVo implements Vo { + private static final long serialVersionUID = -3558876605554852892L; + + @ApiModelProperty(value = "组织名称") + private String name; + @ApiModelProperty(value = "部门编码") + private String orgCode; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty(value = "上级sid") + private String psid; + @ApiModelProperty(value = "orgSidPath") + private String orgSidPath; + private List children; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java new file mode 100644 index 00000000..64b868b1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/26 11:48 + * @Description + */ +@Data +public class SysOrgStaffVo implements Vo { + private static final long serialVersionUID = -4311553944345419092L; + + private String staffName; + private String staffSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgVo.java new file mode 100644 index 00000000..e95df72c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgVo.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author dimengzhe + * @date 2021/10/12 20:55 + * @description + */ +@Data +public class SysOrgVo implements Vo { + private static final long serialVersionUID = 2983637708030419942L; + @ApiModelProperty(value = "组织名称") + private String name; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty(value = "psid") + private String psid; + @ApiModelProperty(value = "id") + private String id; + @ApiModelProperty(value = "orgSidPath") + private String orgSidPath; + @ApiModelProperty(value = "部门编码") + private String orgCode; + + private List children; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java new file mode 100644 index 00000000..5f25abb3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganization.java @@ -0,0 +1,87 @@ +package com.yxt.anrui.portal.api.sysorganization; + +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: SysOrganization.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganization
+ * 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_organization") +@Data +public class SysOrganization extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + + @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") + private String orgShortName; + + @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)") + private String regionDivision; + + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + + @ApiModelProperty("组织简称") + private String orgAbbre; + + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + + @ApiModelProperty("管理层级key") + private String orgLevelKey; + + @ApiModelProperty("管理层级value") + private String orgLevelValue; + + @ApiModelProperty("其他编码") + private String otherCode; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java new file mode 100644 index 00000000..2cc2ecd1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationDto.java @@ -0,0 +1,91 @@ +package com.yxt.anrui.portal.api.sysorganization; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationDto.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationDto
+ * 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 SysOrganizationDto implements Dto { + + + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + + @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") + private String orgShortName; + + @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)") + private String regionDivision; + + @ApiModelProperty("主管人员sid") + private String zgStaffSid; + + @ApiModelProperty("分管人员sid") + private String fgStaffSid; + + @ApiModelProperty("组织简称") + private String orgAbbre; + + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + + @ApiModelProperty("管理层级key") + private String orgLevelKey; + + @ApiModelProperty("管理层级value") + private String orgLevelValue; + + @ApiModelProperty("其他编码") + private String otherCode; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java new file mode 100644 index 00000000..ef389856 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -0,0 +1,182 @@ +package com.yxt.anrui.portal.api.sysorganization; + +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.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationFeign.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign
+ * 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 = "组织机构表") +@FeignClient( + contextId = "supervise-portal-SysOrganization", + name = "supervise-portal", + path = "v1/sysorganization", + fallback = SysOrganizationFeignFallback.class) +public interface SysOrganizationFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysOrganizationQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("一级组织机构列表") + @GetMapping("/selectFirstOrgList") + public ResultBean> selectFirstOrgList(); + + @ApiOperation("根据父级sid查询子集列表") + @GetMapping("/selectChildrenListBySid/{sid}") + public ResultBean> selectChildrenListBySid(@PathVariable("sid") String sid); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysOrganizationDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysOrganizationDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录 根据sid") + @ResponseBody + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + + @ApiOperation("手机获取组织架构") + @ResponseBody + @GetMapping("/selectAppOrganization") + public ResultBean> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid); + + @ApiOperation("组织架构") + @ResponseBody + @GetMapping("/selectListOrg") + ResultBean> selectListOrg(); + + @ApiOperation("获取到分公司") + @ResponseBody + @GetMapping("/getListOrg") + ResultBean> getListOrg(); + + @ApiOperation("获取同品牌下分公司") + @ResponseBody + @GetMapping("/getListOrgByBrand/{orgSid}") + ResultBean> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid); + + @ApiOperation("获取指定品牌下分公司(已筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid); + + @ApiOperation("获取指定品牌下分公司(未筛选本分公司)") + @ResponseBody + @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}") + ResultBean> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid); + + @ApiOperation("获取指定分公司下部门信息") + @ResponseBody + @GetMapping("/getListDeptByOrgSid/{orgSid}") + ResultBean> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid); + + @ApiOperation("根据业务员sid获取到分公司") + @ResponseBody + @GetMapping("/getUseOrgByUserSid") + ResultBean getUseOrgByUserSid(@RequestParam("userSid") String userSid); + + @ApiOperation("根据部门sid查询组织信息") + @ResponseBody + @GetMapping("/selectBySid") + ResultBean selectBySid(@RequestParam("sid") String sid); + + @ApiOperation("根据组织架构sid查询组织下所有分公司") + @ResponseBody + @GetMapping("/selectUseOrgSidBySid") + ResultBean>> selectUseOrgSidBySid(@RequestParam("sid") String sid); + + /** + * 查询公司所有的部门 + * + * @return + */ + @ApiOperation("所在部门下拉") + @ResponseBody + @GetMapping("/selectListOne") + ResultBean> selectListOne(); + + @PostMapping("/getQrCode/{sid}") + @ResponseBody + @ApiOperation("查看二维码") + public ResultBean getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @GetMapping("/getOrgSid/{sid}") + @ResponseBody + @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司") + ResultBean getOrgSid(@PathVariable(value = "sid") String sid); + + @GetMapping("/selectOrgList") + @ResponseBody + @ApiOperation("当前分公司销售部门及部门人员") + ResultBean> selectOrgList(@SpringQueryMap SysOrganizationListQuery query); + + @GetMapping("/selectOrgLists") + @ResponseBody + @ApiOperation("当前分公司下所有部门") + ResultBean> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query); + + @GetMapping("/selectByPSid") + @ResponseBody + @ApiOperation("查询分公司下的销售支持部") + ResultBean selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name); + + @GetMapping("/selectOrgSidList") + @ResponseBody + @ApiOperation("所有分公司sid") + ResultBean> selectOrgSidList(); + + @GetMapping("/selectOrgByPSid") + @ResponseBody + @ApiOperation("查询事业部下所有分公司") + ResultBean> selectOrgByPSid(@RequestParam("psid") String psid); + + @GetMapping("/selectByOrgSidPath") + @ResponseBody + @ApiOperation("组织层级分页查询") + ResultBean selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java new file mode 100644 index 00000000..29835104 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -0,0 +1,184 @@ +package com.yxt.anrui.portal.api.sysorganization; + +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; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeignFallback
+ * 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 + */ +@Component +public class SysOrganizationFeignFallback implements SysOrganizationFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysorganization/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysOrganizationQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysorganization/listAll无法访问"); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysorganization/list无法访问"); + } + + @Override + public ResultBean selectFirstOrgList() { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysorganization/selectFirstOrgList无法访问"); + } + + @Override + public ResultBean selectChildrenListBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysorganization/selectChildrenListBySid无法访问"); + } + + @Override + public ResultBean save(SysOrganizationDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/save无法访问"); + } + + @Override + public ResultBean update(SysOrganizationDto dto, String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/update无法访问"); + } + + @Override + public ResultBean del(String ids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/del无法访问"); + } + + @Override + public ResultBean delBySid(String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/del无法访问"); + + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysorganization/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysorganization/fetchBySid无法访问"); + } + + @Override + public ResultBean selectAppOrganization(String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysorganization/selectAppOrganization无法访问"); + } + + @Override + public ResultBean> selectListOrg() { + return null; + } + + @Override + public ResultBean> getListOrg() { + return null; + } + + @Override + public ResultBean> getListOrgByBrand(String orgSid) { + return null; + } + + @Override + public ResultBean> getListOrgByBrandSid(String orgSid, String brandSid) { + return null; + } + + @Override + public ResultBean> getListOrgByBrandSidNo(String orgSid, String brandSid) { + return null; + } + + @Override + public ResultBean> getListDeptByOrgSid(String orgSid) { + return null; + } + + @Override + public ResultBean getUseOrgByUserSid(String staffSid) { + return null; + } + + @Override + public ResultBean selectBySid(String sid) { + return null; + } + + @Override + public ResultBean>> selectUseOrgSidBySid(String sid) { + return null; + } + + @Override + public ResultBean> selectListOne() { + return null; + } + + @Override + public ResultBean getQrCode(String sid) { + return null; + } + + @Override + public ResultBean getOrgSid(String sid) { + return null; + } + + @Override + public ResultBean> selectOrgList(SysOrganizationListQuery query) { + return null; + } + + @Override + public ResultBean> selectOrgLists(SysOrganizationListQuery query) { + return null; + } + + @Override + public ResultBean selectByPSid(String sid, String name) { + return null; + } + + @Override + public ResultBean> selectOrgSidList() { + return null; + } + + @Override + public ResultBean> selectOrgByPSid(String psid) { + return null; + } + + @Override + public ResultBean selectByOrgSidPath(String orgSidPath) { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java new file mode 100644 index 00000000..debd0cf1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListQuery.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/26 11:49 + * @Description + */ +@Data +public class SysOrganizationListQuery implements Query { + private static final long serialVersionUID = 8657016527420117948L; + + private String userSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java new file mode 100644 index 00000000..584bfb9b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/26 11:42 + * @Description + */ +@Data +public class SysOrganizationListVo implements Vo { + private static final long serialVersionUID = -3709239161608411765L; + + private String orgDeptSid; + private String orgDeptName; + + private List staffinfoVoList; + + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java new file mode 100644 index 00000000..a93ab2d4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationListsVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/30 11:28 + * @Description + */ +@Data +public class SysOrganizationListsVo implements Vo { + private static final long serialVersionUID = -7021974833444298712L; + + private String orgDeptSid; + private String orgDeptName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationQuery.java new file mode 100644 index 00000000..f0c4267c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationQuery.java @@ -0,0 +1,58 @@ +package com.yxt.anrui.portal.api.sysorganization; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationQuery.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationQuery
+ * 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 SysOrganizationQuery implements Query { + + + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java new file mode 100644 index 00000000..bbfefd8e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java @@ -0,0 +1,86 @@ +package com.yxt.anrui.portal.api.sysorganization; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysOrganizationVo.java
+ * Class: com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo
+ * 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 SysOrganizationVo implements Vo { + @ApiModelProperty("部门/组织名称") + private String name; + + @ApiModelProperty("父(部门/组织) sid") + private String psid; + + @ApiModelProperty("联系电话") + private String linkPhone; + + @ApiModelProperty("联系人") + private String linkPerson; + + @ApiModelProperty("部门sid全路径") + private String orgSidPath; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("地址") + private String addrs; + + @ApiModelProperty("地理位置经纬度") + private String jwd; + + @ApiModelProperty("二维码") + private String qrText; + + @ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己") + private Integer limitOrgMember; + + @ApiModelProperty("部门编码") + private String orgCode; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("子集") + private List children = new ArrayList<>(); + @ApiModelProperty("主管人员名称") + private String zgNames; + @ApiModelProperty("分管人员名称") + private String fgNames; + @ApiModelProperty("主管人员sid") + private String zgStaffSid; + @ApiModelProperty("分管人员sid") + private String fgStaffSid; + @ApiModelProperty("组织简称") + private String orgAbbre; + @ApiModelProperty("是否是部门(0否，1是)") + private Integer isDept; + @ApiModelProperty("组织属性key") + private String orgAttributeKey; + @ApiModelProperty("组织属性value") + private String orgAttributeValue; + @ApiModelProperty("管理层级key") + private String orgLevelKey; + @ApiModelProperty("管理层级value") + private String orgLevelValue; + @ApiModelProperty("其他编码") + private String otherCode; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPost.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPost.java new file mode 100644 index 00000000..5ecbfd12 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPost.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.portal.api.syspost; + +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: SysPost.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPost
+ * 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_post") +@Data +public class SysPost extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + + @ApiModelProperty("所属部门sid") + private String orgSid; + + @ApiModelProperty(value = "父级sid") + private String parentSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostDto.java new file mode 100644 index 00000000..772e1feb --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostDto.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.portal.api.syspost; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostDto.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostDto
+ * 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 SysPostDto implements Dto { + + private static final long serialVersionUID = 863876947510030464L; + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + + @ApiModelProperty("所属部门sid") + private String orgSid; + + @ApiModelProperty(value = "父级sid", example = "0") + private String parentSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeign.java new file mode 100644 index 00000000..9abcc715 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeign.java @@ -0,0 +1,89 @@ +package com.yxt.anrui.portal.api.syspost; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostFeign.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeign
+ * 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 = "岗位") +@FeignClient( + contextId = "supervise-portal-SysPost", + name = "supervise-portal", + path = "v1/syspost", + fallback = SysPostFeignFallback.class) +public interface SysPostFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysPostQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysPostDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("删除记录") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据部门sid获取岗位列表") + @GetMapping("/fetchByOrgSid/{orgSid}") + public ResultBean> fetchByOrgSid(@PathVariable("orgSid") String orgSid); + + @ApiOperation("根据部门sid获取岗位编号") + @GetMapping("/fetchByOrgSidPostCode/{orgSid}") + public ResultBean fetchByOrgSidPostCode(); + + /** + * 查询岗位列表 + * + * @return + */ + @ApiOperation("查询岗位列表") + @GetMapping("/selectList") + public ResultBean> selectList(); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeignFallback.java new file mode 100644 index 00000000..f0b09fae --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostFeignFallback.java @@ -0,0 +1,91 @@ +package com.yxt.anrui.portal.api.syspost; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostFeignFallback
+ * 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 + */ +@Component +public class SysPostFeignFallback implements SysPostFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syspost/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysPostQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syspost/listAll无法访问"); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syspost/list无法访问"); + } + + @Override + public ResultBean save(SysPostDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/syspost/save无法访问"); + } + + @Override + public ResultBean update(SysPostDto dto, String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/syspost/update无法访问"); + } + + @Override + public ResultBean del(String ids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/syspost/del无法访问"); + } + + @Override + public ResultBean delBySids(String sids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/syspost/delBySids无法访问"); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syspost/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syspost/fetchBySid无法访问"); + } + + @Override + public ResultBean> fetchByOrgSid(String orgSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syspost/fetchByOrgSid无法访问"); + } + + @Override + public ResultBean fetchByOrgSidPostCode() { + return null; + } + + @Override + public ResultBean> selectList() { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostListVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostListVo.java new file mode 100644 index 00000000..1d95f4c3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostListVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.portal.api.syspost; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/2/14 13:49 + * @Description 部门下的岗位信息 + */ +@Data +public class SysPostListVo implements Vo { + private static final long serialVersionUID = -8060032905868283959L; + + @ApiModelProperty("岗位名称") + private String name; + @ApiModelProperty("岗位编码") + private String postCode; + @ApiModelProperty("岗位sid") + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostQuery.java new file mode 100644 index 00000000..dd59f965 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostQuery.java @@ -0,0 +1,41 @@ +package com.yxt.anrui.portal.api.syspost; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostQuery.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostQuery
+ * 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 SysPostQuery implements Query { + + + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + + @ApiModelProperty("所属部门sid") + private String orgSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostVo.java new file mode 100644 index 00000000..48838895 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syspost/SysPostVo.java @@ -0,0 +1,52 @@ +package com.yxt.anrui.portal.api.syspost; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostVo.java
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostVo
+ * 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 SysPostVo implements Vo { + + + @ApiModelProperty("岗位名称") + private String name; + + @ApiModelProperty("职级key") + private String postLevelKey; + + @ApiModelProperty("职级") + private String postLevel; + + @ApiModelProperty("岗位编码") + private String postCode; + + @ApiModelProperty("所属部门sid") + private String orgSid; + + @ApiModelProperty("所属部门名称") + private String orgName; + + @ApiModelProperty("岗位sid") + private String sid; + + @ApiModelProperty(value = "上级岗位名称") + private String parentName; + @ApiModelProperty(value = "上级岗位sid") + private String parentSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java new file mode 100644 index 00000000..83b718f7 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRole.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.portal.api.sysrole; + +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: SysRole.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRole
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色", description = "角色") +@TableName("sys_role") +@Data +public class SysRole extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("角色名称") + private String name; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("编码") + private String code; + + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; + + @ApiModelProperty("岗位sid") + private String postSid; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java new file mode 100644 index 00000000..5409e6c1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleDto.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.portal.api.sysrole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleDto
+ * Description: 角色 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色 数据传输对象", description = "角色 数据传输对象") +@Data +public class SysRoleDto implements Dto { + + + @ApiModelProperty("角色名称") + private String name; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("编码") + private String code; + @ApiModelProperty("备注") + private String remarks; + + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; + + @ApiModelProperty("岗位sid") + private String postSid; + + @ApiModelProperty("岗位名称") + private String postName; + + @ApiModelProperty(value = "角色组织层级key") + private String roleType; + @ApiModelProperty(value = "角色组织层级value") + private String roleTypeValue; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java new file mode 100644 index 00000000..c099f36d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeign.java @@ -0,0 +1,83 @@ +package com.yxt.anrui.portal.api.sysrole; + +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.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色") +@FeignClient( + contextId = "supervise-portal-SysRole", + name = "supervise-portal", + path = "v1/sysrole", + fallback = SysRoleFeignFallback.class) +public interface SysRoleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysRoleQuery query); + @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色") + @PostMapping("/listAllByUserSid/{userSid}") + public ResultBean> listAllByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation("根据用户sid查询用户的角色列表") + @PostMapping("/fetchByUserSid/{userSid}") + public ResultBean> fetchByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysRoleDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("删除记录根据sids") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("获取一条记录根据sid") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + @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); + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java new file mode 100644 index 00000000..cdea591b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleFeignFallback.java @@ -0,0 +1,91 @@ +package com.yxt.anrui.portal.api.sysrole; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysRoleFeignFallback implements SysRoleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrole/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrole/listAll无法访问"); + } + + @Override + public ResultBean> listAllByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrole/listAllByUserSid无法访问"); + } + + @Override + public ResultBean> fetchByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrole/fetchByUserSid无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrole/list无法访问"); + } + + @Override + public ResultBean save(SysRoleDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrole/save无法访问"); + } + + @Override + public ResultBean update(SysRoleDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrole/update无法访问"); + } + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrole/del无法访问"); + } + + @Override + public ResultBean delBySids(String sids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrole/delBySids无法访问"); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrole/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrole/fetchBySid无法访问"); + } + + @Override + public ResultBean setIsEnable(String sid, String isEnable) { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleQuery.java new file mode 100644 index 00000000..9b63027f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleQuery.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.portal.api.sysrole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleQuery
+ * Description: 角色 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色 查询条件", description = "角色 查询条件") +@Data +public class SysRoleQuery implements Query { + + + @ApiModelProperty("角色名称") + private String name; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("编码") + private String code; + + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java new file mode 100644 index 00000000..2912faea --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrole/SysRoleVo.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.portal.api.sysrole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleVo
+ * Description: 角色 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色 视图数据对象", description = "角色 视图数据对象") +@Data +public class SysRoleVo implements Vo { + @ApiModelProperty("角色名称") + private String name; + @ApiModelProperty("排序") + private Integer sort; + @ApiModelProperty("编码") + private String code; + @ApiModelProperty("1、系统管理员、2、普通角色") + private Integer type; + @ApiModelProperty("角色sid") + private String sid; + @ApiModelProperty("说明") + private String remarks; + @ApiModelProperty("是否选中，1：未选中,0：选中") + private String checked; + @ApiModelProperty("是否可用") + private String isEnable; + @ApiModelProperty("岗位sid") + private String postSid; + @ApiModelProperty("岗位名称") + private String postName; + @ApiModelProperty(value = "组织层级") + private String roleTypeValue; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunction.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunction.java new file mode 100644 index 00000000..ff617556 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunction.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.sysrolefunction; + +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: SysRoleFunction.java
+ * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunction
+ * Description: 角色与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色与功能关联表", description = "角色与功能关联表") +@TableName("sys_role_function") +@Data +public class SysRoleFunction extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("功能sid") + private String functionSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionDto.java new file mode 100644 index 00000000..672e49c2 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysrolefunction; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionDto.java
+ * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionDto
+ * Description: 角色与功能关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色与功能关联表 数据传输对象", description = "角色与功能关联表 数据传输对象") +@Data +public class SysRoleFunctionDto implements Dto { + + + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("功能sid") + private String functionSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java new file mode 100644 index 00000000..941b8936 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeign.java @@ -0,0 +1,67 @@ +package com.yxt.anrui.portal.api.sysrolefunction; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionFeign
+ * Description: 角色与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色与功能关联表") +@FeignClient( + contextId = "supervise-portal-SysRoleFunction", + name = "supervise-portal", + path = "v1/sysrolefunction", + fallback = SysRoleFunctionFeignFallback.class) +public interface SysRoleFunctionFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysRoleFunctionQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysRoleFunctionDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysRoleFunctionDto dto,@PathVariable("sid") String sid); + @ApiOperation("修改角色的功能配置") + @PostMapping("/updateRoleAndFunction") + public ResultBean updateRoleAndFunction(@RequestBody SysRoleFunctionDto dto); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeignFallback.java new file mode 100644 index 00000000..85d8d6a9 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionFeignFallback.java @@ -0,0 +1,69 @@ +package com.yxt.anrui.portal.api.sysrolefunction; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionFeignFallback
+ * Description: 角色与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysRoleFunctionFeignFallback implements SysRoleFunctionFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrolefunction/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysRoleFunctionQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrolefunction/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrolefunction/list无法访问"); + } + + @Override + public ResultBean save(SysRoleFunctionDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrolefunction/save无法访问"); + } + + @Override + public ResultBean update(SysRoleFunctionDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrolefunction/update无法访问"); + } + + @Override + public ResultBean updateRoleAndFunction(SysRoleFunctionDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrolefunction/updateRoleAndFunction无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysrolefunction/del无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysrolefunction/fetch无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionQuery.java new file mode 100644 index 00000000..0742daff --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionQuery.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysrolefunction; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionQuery.java
+ * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionQuery
+ * Description: 角色与功能关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色与功能关联表 查询条件", description = "角色与功能关联表 查询条件") +@Data +public class SysRoleFunctionQuery implements Query { + + + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("功能sid") + private String functionSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionVo.java new file mode 100644 index 00000000..d89fee1a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysrolefunction/SysRoleFunctionVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysrolefunction; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionVo.java
+ * Class: com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionVo
+ * Description: 角色与功能关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "角色与功能关联表 视图数据对象", description = "角色与功能关联表 视图数据对象") +@Data +public class SysRoleFunctionVo implements Vo { + + + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("功能sid") + private String functionSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSource.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSource.java new file mode 100644 index 00000000..a100bee1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSource.java @@ -0,0 +1,76 @@ +package com.yxt.anrui.portal.api.syssource; + +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: SysSource.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSource
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源表", description = "资源表") +@TableName("sys_source") +@Data +public class SysSource extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("父资源sid") + private String pSid; + + @ApiModelProperty("资源ID（对应微服务的名称）") + private String sourceId; + + @ApiModelProperty("资源名称（业务模块名称）") + private String sourceName; + + @ApiModelProperty("web页面的url（平台中业务模块跳转地址）") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源图标背景颜色") + private String iconBgColor; + + @ApiModelProperty("资源url标识") + private String urlSign; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("资源类别（0.内置Activity 1.内置WebView 2.RePlugin插件 3.原生apk 4.We页面）") + private Integer sourceType; + + @ApiModelProperty("模块的版本（type = 2，3有），移动端专用") + private String ver; + + @ApiModelProperty("apk下载地址（type = 2，3有），移动端专用") + private String sourceUrl; + + @ApiModelProperty("模块的包名，移动端专用") + private String sourcePackage; + + @ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用") + private String sourceAction; + + @ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数") + private String sourceExtra; + + @ApiModelProperty("提示数量(没有返回0即可)") + private String noticeNum; + + @ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用") + private String modulePluginName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceDto.java new file mode 100644 index 00000000..4f86d863 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceDto.java @@ -0,0 +1,76 @@ +package com.yxt.anrui.portal.api.syssource; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceDto.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceDto
+ * Description: 资源表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源表 数据传输对象", description = "资源表 数据传输对象") +@Data +public class SysSourceDto implements Dto { + + + @ApiModelProperty("父资源sid") + private String pSid; + + @ApiModelProperty("资源ID（对应微服务的名称）") + private String sourceId; + + @ApiModelProperty("资源名称（业务模块名称）") + private String sourceName; + + @ApiModelProperty("web页面的url（平台中业务模块跳转地址）") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源图标背景颜色") + private String iconBgColor; + + @ApiModelProperty("资源url标识") + private String urlSign; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("资源类别（0.内置Activity 1.内置WebView 2.RePlugin插件 3.原生apk 4.We页面）") + private Integer sourceType; + + @ApiModelProperty("模块的版本（type = 2，3有），移动端专用") + private String ver; + + @ApiModelProperty("apk下载地址（type = 2，3有），移动端专用") + private String sourceUrl; + + @ApiModelProperty("模块的包名，移动端专用") + private String sourcePackage; + + @ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用") + private String sourceAction; + + @ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数") + private String sourceExtra; + + @ApiModelProperty("提示数量(没有返回0即可)") + private String noticeNum; + @ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用") + private String modulePluginName; + @ApiModelProperty("描述") + private String remarks; + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeign.java new file mode 100644 index 00000000..ff636b61 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeign.java @@ -0,0 +1,73 @@ +package com.yxt.anrui.portal.api.syssource; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFeign.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeign
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资源表") +@FeignClient( + contextId = "supervise-portal-SysSource", + name = "supervise-portal", + path = "v1/syssource", + fallback = SysSourceFeignFallback.class) +public interface SysSourceFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysSourceQuery query); + @ApiOperation("根据角色sid条件查询所有数据列表") + @PostMapping("/listAllByRoleSid") + public ResultBean> listAllByRoleSid(@RequestBody SysSourceQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysSourceDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysSourceDto dto,@PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + @ApiOperation("删除记录 根据sid") + @GetMapping("/delBySids/{sids}") + public ResultBean delBySids(@PathVariable("sids") String sids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + @ApiOperation("获取一条记录 根据sid") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeignFallback.java new file mode 100644 index 00000000..37a987b0 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceFeignFallback.java @@ -0,0 +1,81 @@ +package com.yxt.anrui.portal.api.syssource; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceFeignFallback
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysSourceFeignFallback implements SysSourceFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssource/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysSourceQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssource/listAll无法访问"); + } + + @Override + public ResultBean> listAllByRoleSid(SysSourceQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssource/listAllByRoleSid无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssource/list无法访问"); + } + + @Override + public ResultBean save(SysSourceDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssource/save无法访问"); + } + + @Override + public ResultBean update(SysSourceDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssource/update无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssource/del无法访问"); + } + + @Override + public ResultBean delBySids(String sids) { + return ResultBean.fireFail().setMsg("接口anrui_portal/syssource/delBySids无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssource/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssource/fetchBySid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceQuery.java new file mode 100644 index 00000000..0ebbc834 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceQuery.java @@ -0,0 +1,78 @@ +package com.yxt.anrui.portal.api.syssource; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceQuery.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceQuery
+ * Description: 资源表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源表 查询条件", description = "资源表 查询条件") +@Data +public class SysSourceQuery implements Query { + + + @ApiModelProperty("父资源sid") + private String pSid; + + @ApiModelProperty("资源ID（对应微服务的名称）") + private String sourceId; + + @ApiModelProperty("角色sid") + private String roleSid; + + @ApiModelProperty("资源名称（业务模块名称）") + private String sourceName; + + @ApiModelProperty("web页面的url（平台中业务模块跳转地址）") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源图标背景颜色") + private String iconBgColor; + + @ApiModelProperty("资源url标识") + private String urlSign; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("资源类别（0.内置Activity 1.内置WebView 2.RePlugin插件 3.原生apk 4.We页面）") + private Integer sourceType; + + @ApiModelProperty("模块的版本（type = 2，3有），移动端专用") + private String ver; + + @ApiModelProperty("apk下载地址（type = 2，3有），移动端专用") + private String sourceUrl; + + @ApiModelProperty("模块的包名，移动端专用") + private String sourcePackage; + + @ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用") + private String sourceAction; + + @ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数") + private String sourceExtra; + + @ApiModelProperty("提示数量(没有返回0即可)") + private String noticeNum; + + @ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用") + private String modulePluginName; + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceVo.java new file mode 100644 index 00000000..ade3948a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssource/SysSourceVo.java @@ -0,0 +1,85 @@ +package com.yxt.anrui.portal.api.syssource; + + +import com.yxt.anrui.portal.api.sysmenu.SysMenuVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceVo.java
+ * Class: com.yxt.anrui.portal.api.syssource.SysSourceVo
+ * Description: 资源表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源表 视图数据对象", description = "资源表 视图数据对象") +@Data +public class SysSourceVo implements Vo { + + + @ApiModelProperty("父资源sid") + private String pSid; + + @ApiModelProperty("资源ID（对应微服务的名称）") + private String sourceId; + + @ApiModelProperty("资源名称（业务模块名称）") + private String sourceName; + + @ApiModelProperty("web页面的url（平台中业务模块跳转地址）") + private String pageUrl; + + @ApiModelProperty("菜单图标地址") + private String iconUrl; + + @ApiModelProperty("资源图标背景颜色") + private String iconBgColor; + + @ApiModelProperty("资源url标识") + private String urlSign; + + @ApiModelProperty("排序号") + private Integer sortNo; + + @ApiModelProperty("资源类别（0.内置Activity 1.内置WebView 2.RePlugin插件 3.原生apk 4.We页面）") + private Integer sourceType; + + @ApiModelProperty("模块的版本（type = 2，3有），移动端专用") + private String ver; + + @ApiModelProperty("apk下载地址（type = 2，3有），移动端专用") + private String sourceUrl; + + @ApiModelProperty("模块的包名，移动端专用") + private String sourcePackage; + + @ApiModelProperty("启动模块的动作(0.启动Activity的包名+类名 1.html地址 2.启动Activity的包名+类名 3.intent-action )，移动端专用") + private String sourceAction; + + @ApiModelProperty("需要用到的json拼接(由目标模块 自行解析)，其他参数") + private String sourceExtra; + + @ApiModelProperty("提示数量(没有返回0即可)") + private String noticeNum; + + @ApiModelProperty("RePlugin插件名称(type = 2有)，移动端专用") + private String modulePluginName; + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("是否选中 1没有选中，0选中") + private String checked; + @ApiModelProperty("描述") + private String remarks; + @ApiModelProperty("菜单集合") + private List children; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunction.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunction.java new file mode 100644 index 00000000..6144abeb --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunction.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.syssourcefunction; + +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: SysSourceFunction.java
+ * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunction
+ * Description: 资源与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与功能关联表", description = "资源与功能关联表") +@TableName("sys_source_function") +@Data +public class SysSourceFunction extends BaseEntity { + private static final long serialVersionUID = 1L; + @ApiModelProperty("功能sid") + private String functionSid; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("功能根目录sid") + private String functionRootSid; +} + diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionDto.java new file mode 100644 index 00000000..faa42d87 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcefunction; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionDto.java
+ * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionDto
+ * Description: 资源与功能关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与功能关联表 数据传输对象", description = "资源与功能关联表 数据传输对象") +@Data +public class SysSourceFunctionDto implements Dto { + + + @ApiModelProperty("功能sid") + private String functionSid; + + @ApiModelProperty("资源sid") + private String sourceSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeign.java new file mode 100644 index 00000000..bf61770f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeign.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.portal.api.syssourcefunction; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionFeign.java
+ * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionFeign
+ * Description: 资源与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资源与功能关联表") +@FeignClient( + contextId = "supervise-portal-SysSourceFunction", + name = "supervise-portal", + path = "v1/syssourcefunction", + fallback = SysSourceFunctionFeignFallback.class) +public interface SysSourceFunctionFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysSourceFunctionQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysSourceFunctionDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysSourceFunctionDto dto,@PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeignFallback.java new file mode 100644 index 00000000..3bcb326e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionFeignFallback.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.portal.api.syssourcefunction; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionFeignFallback
+ * Description: 资源与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysSourceFunctionFeignFallback implements SysSourceFunctionFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcefunction/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysSourceFunctionQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcefunction/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcefunction/list无法访问"); + } + + @Override + public ResultBean save(SysSourceFunctionDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssourcefunction/save无法访问"); + } + + @Override + public ResultBean update(SysSourceFunctionDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssourcefunction/update无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssourcefunction/del无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcefunction/fetch无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionQuery.java new file mode 100644 index 00000000..646003ba --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionQuery.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcefunction; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionQuery.java
+ * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionQuery
+ * Description: 资源与功能关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与功能关联表 查询条件", description = "资源与功能关联表 查询条件") +@Data +public class SysSourceFunctionQuery implements Query { + + + @ApiModelProperty("功能sid") + private String functionSid; + + @ApiModelProperty("资源sid") + private String sourceSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionVo.java new file mode 100644 index 00000000..516c709c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcefunction/SysSourceFunctionVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcefunction; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionVo.java
+ * Class: com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionVo
+ * Description: 资源与功能关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与功能关联表 视图数据对象", description = "资源与功能关联表 视图数据对象") +@Data +public class SysSourceFunctionVo implements Vo { + + + @ApiModelProperty("功能sid") + private String functionSid; + + @ApiModelProperty("资源sid") + private String sourceSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenu.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenu.java new file mode 100644 index 00000000..c8e37347 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenu.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.portal.api.syssourcemenu; + +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_source_menu") +@Data +public class SysSourceMenu extends BaseEntity { + private static final long serialVersionUID = 1L; + @ApiModelProperty("菜单sid") + private String menuSid; + @ApiModelProperty("资源sid") + private String sourceSid; + @ApiModelProperty("菜单根目录sid") + private String menuRootSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuDto.java new file mode 100644 index 00000000..99e8e141 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcemenu; + + +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 SysSourceMenuDto implements Dto { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("资源sid") + private String sourceSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeign.java new file mode 100644 index 00000000..59c56257 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeign.java @@ -0,0 +1,64 @@ +package com.yxt.anrui.portal.api.syssourcemenu; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceMenuFeign.java
+ * Class: com.yxt.anrui.portal.api.SysSourceMenu.SysSourceMenuFeign
+ * 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 = "菜单与资源关联表") +@FeignClient( + contextId = "supervise-portal-SysSourceMenu", + name = "supervise-portal", + path = "v1/syssourcemenu", + fallback = SysSourceMenuFeignFallback.class) +public interface SysSourceMenuFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysSourceMenuQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysSourceMenuDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysSourceMenuDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeignFallback.java new file mode 100644 index 00000000..e50c1d1d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuFeignFallback.java @@ -0,0 +1,60 @@ +package com.yxt.anrui.portal.api.syssourcemenu; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceMenuFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.SysSourceMenu.SysSourceMenuFeignFallback
+ * 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 + */ +@Component +public class SysSourceMenuFeignFallback implements SysSourceMenuFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> listAll(SysSourceMenuQuery query) { + return null; + } + + @Override + public ResultBean> list() { + return null; + } + + @Override + public ResultBean del(String ids) { + return null; + } + + @Override + public ResultBean fetch(String id) { + return null; + } + + @Override + public ResultBean update(SysSourceMenuDto dto, String sid) { + return null; + } + + @Override + public ResultBean save(SysSourceMenuDto dto) { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuQuery.java new file mode 100644 index 00000000..35f0e195 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuQuery.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcemenu; + + +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 SysSourceMenuQuery implements Query { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("资源sid") + private String sourceSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuVo.java new file mode 100644 index 00000000..132a03d4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcemenu/SysSourceMenuVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.portal.api.syssourcemenu; + + +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 SysSourceMenuVo implements Vo { + + + @ApiModelProperty("菜单sid") + private String menuSid; + + @ApiModelProperty("资源sid") + private String sourceSid; + + + @ApiModelProperty("菜单根目录sid") + private String menuRootSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRole.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRole.java new file mode 100644 index 00000000..67ad5cda --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRole.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.syssourcerole; + +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: SysSourceRole.java
+ * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRole
+ * Description: 资源与角色的关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与角色的关联表", description = "资源与角色的关联表") +@TableName("sys_source_role") +@Data +public class SysSourceRole extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("资源sid") + private String sorceSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleDto.java new file mode 100644 index 00000000..9ae52e5e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcerole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleDto.java
+ * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleDto
+ * Description: 资源与角色的关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与角色的关联表 数据传输对象", description = "资源与角色的关联表 数据传输对象") +@Data +public class SysSourceRoleDto implements Dto { + + + @ApiModelProperty("资源sid") + private String sorceSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeign.java new file mode 100644 index 00000000..6be81f98 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeign.java @@ -0,0 +1,68 @@ +package com.yxt.anrui.portal.api.syssourcerole; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleFeign
+ * Description: 资源与角色的关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资源与角色的关联表") +@FeignClient( + contextId = "supervise-portal-SysSourceRole", + name = "supervise-portal", + path = "v1/syssourcerole", + fallback = SysSourceRoleFeignFallback.class) +public interface SysSourceRoleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysSourceRoleQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysSourceRoleDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysSourceRoleDto dto,@PathVariable("sid") String sid); + + @ApiOperation("修改角色的资源配置") + @PostMapping("/updateRoleAndSource") + public ResultBean updateRoleAndSource(@RequestBody SysSourceRoleDto dto); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeignFallback.java new file mode 100644 index 00000000..004a5cca --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleFeignFallback.java @@ -0,0 +1,69 @@ +package com.yxt.anrui.portal.api.syssourcerole; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleFeignFallback
+ * Description: 资源与角色的关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysSourceRoleFeignFallback implements SysSourceRoleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcerole/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysSourceRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcerole/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcerole/list无法访问"); + } + + @Override + public ResultBean save(SysSourceRoleDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssourcerole/save无法访问"); + } + + @Override + public ResultBean update(SysSourceRoleDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssourcerole/update无法访问"); + } + + @Override + public ResultBean updateRoleAndSource(SysSourceRoleDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/syssourcerole/updateRoleAndSource无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/syssourcerole/del无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/syssourcerole/fetch无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleQuery.java new file mode 100644 index 00000000..dda397ef --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleQuery.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcerole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleQuery
+ * Description: 资源与角色的关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与角色的关联表 查询条件", description = "资源与角色的关联表 查询条件") +@Data +public class SysSourceRoleQuery implements Query { + + + @ApiModelProperty("资源sid") + private String sorceSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleVo.java new file mode 100644 index 00000000..5f9648a5 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/syssourcerole/SysSourceRoleVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.syssourcerole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleVo.java
+ * Class: com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleVo
+ * Description: 资源与角色的关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "资源与角色的关联表 视图数据对象", description = "资源与角色的关联表 视图数据对象") +@Data +public class SysSourceRoleVo implements Vo { + + + @ApiModelProperty("资源sid") + private String sorceSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/AppContactsDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/AppContactsDetailsVo.java new file mode 100644 index 00000000..23133a0e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/AppContactsDetailsVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/17 + */ +@ApiModel(value = "App通讯录查看详情") +@Data +public class AppContactsDetailsVo implements Vo { + +// @ApiModelProperty("人员sid") +// private String sid; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("头像") + private String headImage; + + @ApiModelProperty("部门名称（路径）") + private String orgNamePath; + + @ApiModelProperty("职位") + private String position; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java new file mode 100644 index 00000000..b13bfddb --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 15:47 + * @Description + */ +@Data +public class PcSysStaffQuery implements Query { + private static final long serialVersionUID = 1858291601540877140L; + @ApiModelProperty(value = "业务员sid") + private String staffSid; + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java new file mode 100644 index 00000000..38d71fce --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/PcSysStaffVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/5/20 15:44 + * @Description + */ +@Data +public class PcSysStaffVo implements Vo { + private static final long serialVersionUID = -9042032921079833819L; + + private String staffSid; + private String staffName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffQuery.java new file mode 100644 index 00000000..ce799682 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffQuery.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2022/2/15 15:22 + * @Description + */ +@Data +public class SysStaffQuery implements Query { + private static final long serialVersionUID = -7345786610678948794L; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "离职日期") + @NotNull(message = "离职日期不能为空") + private Date quitDate; + @ApiModelProperty(value = "离职原因") + @NotBlank(message = "离职原因不能为空") + private String quitReason; + @ApiModelProperty(value = "员工sid") + private String sid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfo.java new file mode 100644 index 00000000..21eb9a9d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfo.java @@ -0,0 +1,173 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +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; + +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfo.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表", description = "人员基础信息表") +@TableName("sys_staffinfo") +@Data +public class SysStaffinfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("工号") + private String jobNumber; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("性别key:1男，2女") + private Integer genderKey; + @ApiModelProperty(value = "性别") + private String gender; + @ApiModelProperty("身份证号") + private String idNo; + @ApiModelProperty("证件有效期") + private String idTerm; + @ApiModelProperty("生日") + private Date birthday; + @ApiModelProperty("民族") + private String national; + @ApiModelProperty(value = "民族key") + private String nationalKey; + @ApiModelProperty("籍贯") + private String nativePlace; + @ApiModelProperty(value = "省") + private String province; + @ApiModelProperty(value = "市") + private String city; + @ApiModelProperty(value = "县区") + private String county; + @ApiModelProperty(value = "省code") + private String provinceCode; + @ApiModelProperty(value = "市code") + private String cityCode; + @ApiModelProperty(value = "县区code") + private String countyCode; + @ApiModelProperty("住址") + private String address; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("邮箱") + private String email; + @ApiModelProperty(value = "紧急联系人") + private String emergencyContact; + @ApiModelProperty(value = "紧急联系电话") + private String emergencyMobile; + @ApiModelProperty("政治面貌") + private String poliCode; + @ApiModelProperty(value = "政治面貌key") + private String poliCodeKey; + @ApiModelProperty("婚姻状况") + private String maritalStatus; + @ApiModelProperty("婚姻状况key") + private String maritalStatusKey; + @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）") + private String personType; + @ApiModelProperty("员工类型key") + private String personTypeKey; + @ApiModelProperty("入职时间") + private Date joinCompnyDate; + @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）") + private String probPeriod; + @ApiModelProperty("试用期key") + private String probPeriodKey; + @ApiModelProperty("计划转正日期") + private Date plannedConfirmDate; + @ApiModelProperty("实际转正日期") + private Date confirmationDate; + @ApiModelProperty("银行卡号") + private String bankCardNo; + @ApiModelProperty("开户行") + private String openBank; + @ApiModelProperty("身份证(人像面)") + private String idCardA; + @ApiModelProperty("身份证(国徽面)") + private String idCardB; + @ApiModelProperty("学历证书") + private String diploma; + @ApiModelProperty("学位证书") + private String degreeCertificate; + @ApiModelProperty("前公司离职证明") + private String leaveCertificate; + @ApiModelProperty("员工照片") + private String photo; + @ApiModelProperty("姓名的拼音（全）") + private String pinYinName; + @ApiModelProperty("姓名拼音的首字母（特殊的#表示）") + private String firstPinYinLabel; + @ApiModelProperty(value = "毕业院校") + private String graduate; + @ApiModelProperty(value = "学历/专业") + private String education; + private String educationKey; + @ApiModelProperty(value = "职称") + private String title; + @ApiModelProperty(value = "资格认证") + private String qualification; + @ApiModelProperty(value = "驾照类型") + private String licenseType; + @ApiModelProperty(value = "驾照类型key") + private String licenseTypeKey; + @ApiModelProperty(value = "意外险参保：1是，0否") + private Integer isHaveInsurance; + @ApiModelProperty(value = "意外险参保时间") + private Date insuranceStartDate; + @ApiModelProperty(value = "意外险参保终止日期") + private Date insuranceEndDate; + @ApiModelProperty(value = "意外险参保地") + private String insuranceAddr; + + @ApiModelProperty(value = "养老:1是，0否") + private Integer isHaveAged; + @ApiModelProperty(value = "医疗:1是，0否") + private Integer isHaveMedical; + @ApiModelProperty(value = "工伤：1是，0否") + private Integer isHaveInjury; + @ApiModelProperty(value = "失业：1是，0否") + private Integer isHaveUnemploy; + @ApiModelProperty(value = "社保参保地") + private String insuredPlace; + @ApiModelProperty(value = "纸质档案保管地") + private String paperPlace; + + @ApiModelProperty(value = "合同起止日期") + private Date contractStartDate; + @ApiModelProperty(value = "合同结束日期") + private Date contractEndDate; + @ApiModelProperty(value = "离职日期") + private Date quitDate; + @ApiModelProperty(value = "离职原因") + private String quitReason; + + //=====================================================================// + @ApiModelProperty("首次参加工作时间") + private Date jobDateStart; + @ApiModelProperty("户籍类型") + private String residenceType; + @ApiModelProperty("个人社保账号") + private String socialAccount; + @ApiModelProperty("个人公积金账号") + private String fundAccount; + @ApiModelProperty("职位") + private String position; + @ApiModelProperty("岗位职级") + private String postRank; + @ApiModelProperty("身份证地址") + private String idAddrs; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java new file mode 100644 index 00000000..440b7757 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/24 + */ +@ApiModel(value = "App通讯录（搜索）") +@Data +public class SysStaffinfoAppContactsSearchVo implements Vo { + + @ApiModelProperty("人员sid") + private String sid; + + @ApiModelProperty("用户头像") + private String headImage; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("职位") + private String position; + + @ApiModelProperty("部门名称") + private String orgName; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsVo.java new file mode 100644 index 00000000..7386c1aa --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoAppContactsVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/16 + */ +@ApiModel(value = "App通讯录") +@Data +public class SysStaffinfoAppContactsVo implements Vo { + + @ApiModelProperty("人员sid") + private String sid; + + @ApiModelProperty("姓名") + private String name; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("用户头像") + private String headImage; + + @ApiModelProperty("姓名的拼音（全）") + private String pinYinName; + + @ApiModelProperty("姓名拼音的首字母（特殊的#表示）") + private String firstPinYinLabel; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java new file mode 100644 index 00000000..23c2223d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDetailsVo.java @@ -0,0 +1,155 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/2/11 16:12 + * @Description 员工信息的编辑初始化和详情返回数据 + */ +@Data +public class SysStaffinfoDetailsVo implements Vo { + private static final long serialVersionUID = 1232171677690215067L; + + @ApiModelProperty(value = "工号") + private String jobNumber; + + @ApiModelProperty(value = "姓名") + private String name; + @ApiModelProperty(value = "性别key") + private Integer genderKey; + @ApiModelProperty(value = "性别") + private String gender; + @ApiModelProperty(value = "身份证号") + private String idNo; + @ApiModelProperty(value = "证件有效期") + private String idTerm; + @ApiModelProperty("生日") + private String birthday; + @ApiModelProperty(value = "民族") + private String national; + @ApiModelProperty(value = "民族key") + private String nationalKey; + @ApiModelProperty("籍贯") + private String nativePlace; + @ApiModelProperty(value = "省") + private String province; + @ApiModelProperty(value = "市") + private String city; + @ApiModelProperty(value = "县区") + private String county; + @ApiModelProperty(value = "省code") + private String provinceCode; + @ApiModelProperty(value = "市code") + private String cityCode; + @ApiModelProperty(value = "县区code") + private String countyCode; + @ApiModelProperty("住址") + private String address; + @ApiModelProperty(value = "手机号") + private String mobile; + @ApiModelProperty("邮箱") + private String email; + @ApiModelProperty(value = "紧急联系人") + private String emergencyContact; + @ApiModelProperty(value = "紧急联系电话") + private String emergencyMobile; + @ApiModelProperty("政治面貌") + private String poliCode; + @ApiModelProperty(value = "政治面貌key") + private String poliCodeKey; + @ApiModelProperty("婚姻状况") + private String maritalStatus; + @ApiModelProperty("婚姻状况key") + private String maritalStatusKey; + @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）") + private String personType; + @ApiModelProperty("员工类型key") + private String personTypeKey; + @ApiModelProperty("入职时间") + private String joinCompnyDate; + @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）") + private String probPeriod; + @ApiModelProperty("试用期key") + private String probPeriodKey; + @ApiModelProperty("计划转正日期") + private String plannedConfirmDate; + @ApiModelProperty("实际转正日期") + private String confirmationDate; + @ApiModelProperty("银行卡号") + private String bankCardNo; + @ApiModelProperty("开户行") + private String openBank; + @ApiModelProperty("身份证(人像面)") + private String idCardA; + @ApiModelProperty("身份证(国徽面)") + private String idCardB; + @ApiModelProperty("学历证书") + private String diploma; + @ApiModelProperty("学位证书") + private String degreeCertificate; + @ApiModelProperty("前公司离职证明") + private String leaveCertificate; + @ApiModelProperty("员工照片") + private String photo; + @ApiModelProperty(value = "员工部门信息") + private SysStaffOrgDetailsVo sysStaffOrg; + @ApiModelProperty(value = "员工岗位信息") + private SysStaffPostDetailsVo sysStaffPost; + + //===========================================// + @ApiModelProperty(value = "毕业院校") + private String graduate; + @ApiModelProperty(value = "学历/专业") + private String education; + @ApiModelProperty(value = "职称") + private String title; + @ApiModelProperty(value = "资格认证") + private String qualification; + @ApiModelProperty(value = "驾照类型") + private String licenseType; + @ApiModelProperty(value = "驾照类型key") + private String licenseTypeKey; + @ApiModelProperty(value = "意外险参保：1是，0否") + private Integer isHaveInsurance; + @ApiModelProperty(value = "意外险参保：1是，0否") + private String isHaveInsuranceValue; + @ApiModelProperty(value = "意外险参保时间") + private String insuranceStartDate; + @ApiModelProperty(value = "意外险参保终止日期") + private String insuranceEndDate; + @ApiModelProperty(value = "意外险参保地") + private String insuranceAddr; + @ApiModelProperty(value = "养老:1是，0否") + private Integer isHaveAged; + @ApiModelProperty(value = "养老:1是，0否") + private String isHaveAgedValue; + @ApiModelProperty(value = "医疗:1是，0否") + private Integer isHaveMedical; + @ApiModelProperty(value = "医疗:1是，0否") + private String isHaveMedicalValue; + @ApiModelProperty(value = "工伤：1是，0否") + private Integer isHaveInjury; + @ApiModelProperty(value = "工伤：1是，0否") + private String isHaveInjuryValue; + @ApiModelProperty(value = "失业：1是，0否") + private Integer isHaveUnemploy; + @ApiModelProperty(value = "失业：1是，0否") + private String isHaveUnemployValue; + @ApiModelProperty(value = "社保参保地") + private String insuredPlace; + @ApiModelProperty(value = "纸质档案保管地") + private String paperPlace; + @ApiModelProperty(value = "合同起止日期") + private String contractStartDate; + @ApiModelProperty(value = "合同结束日期") + private String contractEndDate; + @ApiModelProperty(value = "离职日期") + private String quitDate; + @ApiModelProperty(value = "离职原因") + private String quitReason; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java new file mode 100644 index 00000000..3777727b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoDto.java @@ -0,0 +1,185 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoDto.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoDto
+ * Description: 人员基础信息表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表 数据传输对象", description = "人员基础信息表 数据传输对象") +@Data +public class SysStaffinfoDto implements Dto { + + private static final long serialVersionUID = 8637516813924395044L; + @ApiModelProperty(value = "姓名", required = true) + @NotBlank(message = "姓名不能为空") + private String name; + @ApiModelProperty(value = "性别key", required = true) + @NotBlank(message = "性别不能为空") + private String genderKey; + @ApiModelProperty(value = "性别", required = true) + @NotBlank(message = "性别不能为空") + private String gender; + @ApiModelProperty(value = "员工编号") + private String jobNumber; + @ApiModelProperty(value = "身份证号", required = true) + @Pattern(regexp = "/(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)/", message = "请输入正确的身份证号") + @NotBlank(message = "身份证号不能为空") + private String idNo; + @ApiModelProperty(value = "证件有效期", required = true) + @NotBlank(message = "证件有效期不能为空") + private String idTerm; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("生日") + private Date birthday; + @ApiModelProperty(value = "民族", required = true) + @NotBlank(message = "民族不能为空") + private String national; + @ApiModelProperty(value = "民族key", required = true) + @NotBlank(message = "民族不能为空") + private String nationalKey; + @ApiModelProperty(value = "籍贯", required = false) + private String nativePlace; + @ApiModelProperty(value = "省", required = false) + private String province; + @ApiModelProperty(value = "市", required = false) + private String city; + @ApiModelProperty(value = "县区", required = false) + private String county; + @ApiModelProperty(value = "省code", required = false) + private String provinceCode; + @ApiModelProperty(value = "市code", required = false) + private String cityCode; + @ApiModelProperty(value = "县区code", required = false) + private String countyCode; + @ApiModelProperty(value = "住址", required = false) + private String address; + @ApiModelProperty(value = "手机号", required = true) + @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确") + @NotBlank(message = "手机号不能为空") + private String mobile; + @ApiModelProperty(value = "邮箱", required = false) + //@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确") + private String email; + @ApiModelProperty(value = "紧急联系人", required = false) + private String emergencyContact; + @ApiModelProperty(value = "紧急联系电话", required = false) + private String emergencyMobile; + @ApiModelProperty(value = "政治面貌", required = false) + private String poliCode; + @ApiModelProperty(value = "政治面貌key", required = false) + private String poliCodeKey; + @ApiModelProperty(value = "婚姻状况", required = false) + private String maritalStatus; + @ApiModelProperty(value = "婚姻状况key", required = false) + private String maritalStatusKey; + @ApiModelProperty(value = "员工类型", required = true) + @NotBlank(message = "员工类型不能为空") + private String personType; + @ApiModelProperty(value = "员工类型key", required = true) + @NotBlank(message = "员工类型不能为空") + private String personTypeKey; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("入职时间") + private Date joinCompnyDate; + @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）") + private String probPeriod; + @ApiModelProperty("试用期key") + private String probPeriodKey; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("计划转正日期") + private Date plannedConfirmDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("实际转正日期") + private Date confirmationDate; + @ApiModelProperty("银行卡号") + private String bankCardNo; + @ApiModelProperty("开户行") + private String openBank; + @ApiModelProperty("身份证(人像面)") + private String idCardA; + @ApiModelProperty("身份证(国徽面)") + private String idCardB; + @ApiModelProperty("学历证书") + private String diploma; + @ApiModelProperty("学位证书") + private String degreeCertificate; + @ApiModelProperty("前公司离职证明") + private String leaveCertificate; + @ApiModelProperty("员工照片") + private String photo; + @ApiModelProperty(value = "员工部门信息") + private SysStaffOrgDto sysStaffOrg; + @ApiModelProperty(value = "员工岗位信息") + private SysStaffPostDto sysStaffPost; + + //========================================// + @ApiModelProperty(value = "毕业院校") + private String graduate; + @ApiModelProperty(value = "学历/专业") + private String education; + private String educationKey; + @ApiModelProperty(value = "职称") + private String title; + @ApiModelProperty(value = "资格认证") + private String qualification; + @ApiModelProperty(value = "驾照类型") + private String licenseType; + @ApiModelProperty(value = "驾照类型key") + private String licenseTypeKey; + @ApiModelProperty(value = "意外险参保：1是，0否") + private Integer isHaveInsurance; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "意外险参保时间") + private Date insuranceStartDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "意外险参保终止日期") + private Date insuranceEndDate; + @ApiModelProperty(value = "意外险参保地") + private String insuranceAddr; + + @ApiModelProperty(value = "养老:1是，0否") + private Integer isHaveAged; + @ApiModelProperty(value = "医疗:1是，0否") + private Integer isHaveMedical; + @ApiModelProperty(value = "工伤：1是，0否") + private Integer isHaveInjury; + @ApiModelProperty(value = "失业：1是，0否") + private Integer isHaveUnemploy; + @ApiModelProperty(value = "社保参保地") + private String insuredPlace; + @ApiModelProperty(value = "纸质档案保管地") + private String paperPlace; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "合同起止日期") + private Date contractStartDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "合同结束日期") + private Date contractEndDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "离职日期") + private Date quitDate; + @ApiModelProperty(value = "离职原因") + private String quitReason; + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java new file mode 100644 index 00000000..144f9773 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java @@ -0,0 +1,139 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo; +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoFeign.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "人员基础信息表") +@FeignClient( + contextId = "supervise-portal-SysStaffinfo", + name = "supervise-portal", + path = "v1/sysstaffinfo", + fallback = SysStaffinfoFeignFallback.class) +public interface SysStaffinfoFeign { + /** + * 员工管理分页列表 + * + * @param pq 查询条件 + * @return + */ + @ApiOperation("员工管理分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + /** + * 员工信息新增保存 + * + * @param dto 数据传输对象 + * @return + */ + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysStaffinfoDto dto); + + /** + * 员工信息修改保存 + * + * @param dto 数据传输对象 + * @param sid 员工信息sid + * @return + */ + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid); + + /** + * 员工信息删除操作，即离职 + * + * @param sysStaffQuery 数据传输对象 + * @return + */ + @ApiOperation("设置离职") + @PostMapping("/del") + public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery); + + /** + * 员工信息编辑初始化及详情 + * + * @param sid 员工sid + * @return + */ + @ApiOperation("员工信息编辑初始化及详情") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + /** + * 获取集团内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取集团内全部员工姓名") + @GetMapping("/getStaffName") + public ResultBean>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName,@RequestParam(value = "deptSid") String deptSid); + + /** + * 获取部门内全部员工姓名 + * + * @param staffName 员工姓名 + * @return + */ + @ApiOperation("获取部门内全部员工姓名") + @GetMapping("/getStaffNameByDeptSid") + public ResultBean>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid); + + + @ApiOperation("获取App通讯录") + @ResponseBody + @GetMapping("/selectAppContactsList") + public ResultBean> selectAppContactsList(@RequestParam(value = "names", required = false) String names); + + @ApiOperation("app查看通讯录详情") + @ResponseBody + @GetMapping("/selectAppContactsVO/{staffSid}") + public ResultBean selectAppContactsVO(@PathVariable("staffSid") String staffSid); + + @ApiOperation("App通讯录搜索") + @ResponseBody + @PostMapping("/searchAppContactsList") + public ResultBean> searchAppContactsList(@RequestBody PagerQuery pq); + + @ApiOperation("销售订单-内部推荐人下拉框") + @ResponseBody + @GetMapping("/selectStaffList") + ResultBean> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery); + + @ApiOperation("移动端-销售订单-内部推荐人下拉框") + @ResponseBody + @PostMapping("/getUserList") + ResultBean> getUserList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("移动端-存放地点变更-获取人员列表") + @ResponseBody + @GetMapping("/getGressionUserList/{userSid}") + ResultBean> getGressionUserList(@PathVariable("userSid") String userSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java new file mode 100644 index 00000000..28d4cce3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java @@ -0,0 +1,96 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo; +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; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeignFallback
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysStaffinfoFeignFallback implements SysStaffinfoFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffinfo/listPage无法访问"); + } + + @Override + public ResultBean save(SysStaffinfoDto dto) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/save无法访问"); + } + + @Override + public ResultBean update(SysStaffinfoDto dto, String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/update无法访问"); + } + + @Override + public ResultBean del(SysStaffQuery sysStaffQuery) { + return null; + } + + + @Override + public ResultBean fetchBySid(String sid) { + return null; + } + + @Override + public ResultBean>> getStaffName(String staffName,String deptSid) { + return null; + } + + @Override + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + return null; + } + + @Override + public ResultBean selectAppContactsList(String names) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfoselectAppContactsList无法访问"); + } + + @Override + public ResultBean selectAppContactsVO(String staffSid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/selectAppContactsVO无法访问"); + } + + @Override + public ResultBean searchAppContactsList(PagerQuery pq) { + return ResultBean.fireFail().setMsg("接口anrui_portal/searchAppContactsList无法访问"); + } + + @Override + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + return null; + } + + @Override + public ResultBean> getUserList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean> getGressionUserList(String userSid) { + return null; + } + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoQuery.java new file mode 100644 index 00000000..f1497437 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoQuery.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoQuery.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoQuery
+ * Description: 人员基础信息表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表 查询条件", description = "人员基础信息表 查询条件") +@Data +public class SysStaffinfoQuery implements Query { + + + private static final long serialVersionUID = 7101232842735165406L; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("员工类型key") + private String personTypeKey; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("入职开始日期") + private String joinCompnyDateStart; + @ApiModelProperty("入职结束日期") + private String joinCompnyDateEnd; + @ApiModelProperty(value = "所在部门sid") + private String orgSid; + @ApiModelProperty(value = "所在岗位sid") + private String postSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoVo.java new file mode 100644 index 00000000..be0ac3db --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoVo.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoVo.java
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo
+ * Description: 人员基础信息表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "人员基础信息表 视图数据对象", description = "人员基础信息表 视图数据对象") +@Data +public class SysStaffinfoVo implements Vo { + + private static final long serialVersionUID = -1250862291306247261L; + @ApiModelProperty(value = "员工sid") + private String sid; + @ApiModelProperty(value = "员工编号") + private String jobNumber; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("员工类型") + private String personType; + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty(value = "入职日期") + private String joinCompnyDate; + @ApiModelProperty(value = "部门") + private String orgName; + @ApiModelProperty(value = "岗位") + private String postName; + @ApiModelProperty(value = "部门sid") + private String orgSid; + + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxBase64Query.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxBase64Query.java new file mode 100644 index 00000000..7d5cf911 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxBase64Query.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/10/6 16:58 + * @description + */ +@Data +public class WxBase64Query implements Query { + private static final long serialVersionUID = 4307651151043379231L; +// @ApiModelProperty(value = "base64") +// private String base64File; + + @ApiModelProperty(value = "图片全路径") + private String imageUrl; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxSysInfoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxSysInfoQuery.java new file mode 100644 index 00000000..c629a47b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/WxSysInfoQuery.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.portal.api.sysstaffinfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author dimengzhe + * @date 2021/10/6 12:08 + * @description 客户端上传身份证 + */ +@Data +public class WxSysInfoQuery implements Query { + private static final long serialVersionUID = 7273642052588903116L; + @ApiModelProperty(value = "用户sid", required = true) + @NotBlank(message = "用户sid不能为空") + private String userSid; + @ApiModelProperty(value = "身份证(人像面)", required = true) + @NotBlank(message = "身份证(人像面)不能为空") + private String idCardA; + @ApiModelProperty(value = "身份证(国徽面)", required = true) + @NotBlank(message = "身份证(国徽面)不能为空") + private String idCardB; + + @ApiModelProperty(value = "身份证地址", required = true) + @NotBlank(message = "身份证地址不能为空") + private String idAddrs; + @ApiModelProperty(value = "证件有效期", required = true) + @NotBlank(message = "证件有效期不能为空") + private String idTerm; + @ApiModelProperty(value = "生日") + private String birth; + @ApiModelProperty(value = "民族") + private String national; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java new file mode 100644 index 00000000..f024454b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffQuery.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysstaffinfo.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/11 9:44 + * @Description + */ +@Data +public class AppSysStaffQuery implements Query { + private static final long serialVersionUID = 4724669786231817593L; + @ApiModelProperty(value = "用户名称") + private String name; + @ApiModelProperty(value = "用户sid") + private String userSid; + + @ApiModelProperty("组织机构sid") + private String orgPath; + + @ApiModelProperty("已选人员sid") + private List selectSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffVo.java new file mode 100644 index 00000000..e8971073 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/app/AppSysStaffVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.portal.api.sysstaffinfo.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/11 9:29 + * @Description + */ +@Data +public class AppSysStaffVo implements Vo { + private static final long serialVersionUID = -4051562700421770402L; + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "用户名称") + private String userName; + @ApiModelProperty(value = "头像") + private String userImage; + @ApiModelProperty(value = "电话") + private String userMobile; + @ApiModelProperty(value = "部门") + private String department; + @ApiModelProperty(value = "岗位") + private String position; + + @ApiModelProperty(value = "头像：后端内部使用") + private String headImage; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrg.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrg.java new file mode 100644 index 00000000..e720c889 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrg.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.portal.api.sysstafforg; + +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: SysStaffOrg.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg
+ * Description: 员工部门关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表", description = "员工部门关联表") +@TableName("sys_staff_org") +@Data +public class SysStaffOrg extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("部门sid") + private String orgSid; + + @ApiModelProperty("部门名称") + private String orgName; + + @ApiModelProperty("人员sid") + private String staffSid; + + @ApiModelProperty("部门路径") + private String orgSidPath; + + @ApiModelProperty("部门名称路径") + private String orgNamePath; + + @ApiModelProperty("管理类型：1、主管。2、分管。3、员工") + private String manageType; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDetailsVo.java new file mode 100644 index 00000000..aaed2018 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDetailsVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.portal.api.sysstafforg; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/2/11 16:15 + * @Description 员工部门详情信息 + */ +@Data +public class SysStaffOrgDetailsVo implements Vo { + private static final long serialVersionUID = 5354841525724609428L; + + @ApiModelProperty("部门sid") + private String orgSid; + @ApiModelProperty("部门名称") + private String orgName; + @ApiModelProperty("部门路径") + private String orgSidPath; + @ApiModelProperty("部门名称路径") + private String orgNamePath; + @ApiModelProperty(value = "部门编码") + private String orgCode; + @ApiModelProperty("管理类型：1、主管。2、分管。3、员工") + private String manageType; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDto.java new file mode 100644 index 00000000..97a51fd3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgDto.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.portal.api.sysstafforg; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgDto.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto
+ * Description: 员工部门关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表 数据传输对象", description = "员工部门关联表 数据传输对象") +@Data +public class SysStaffOrgDto implements Dto { + + private static final long serialVersionUID = 1403491378761015027L; + @ApiModelProperty("部门sid") + private String orgSid; + @ApiModelProperty("部门名称") + @NotBlank(message = "部门名称不能为空") + private String orgName; + @ApiModelProperty("部门路径") + private String orgSidPath; + @ApiModelProperty("部门名称路径") + private String orgNamePath; + @ApiModelProperty(value = "部门编码") + private String orgCode; + @ApiModelProperty(value = "管理类型：1、主管。2、分管。3、员工", example = "3") + private String manageType; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java new file mode 100644 index 00000000..ade516b9 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -0,0 +1,112 @@ +package com.yxt.anrui.portal.api.sysstafforg; + +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.Api; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgFeign.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign
+ * Description: 员工部门关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "员工部门关联表") +@FeignClient( + contextId = "supervise-portal-SysStaffOrg", + name = "supervise-portal", + path = "v1/sysstafforg", + fallback = SysStaffOrgFeignFallback.class) +public interface SysStaffOrgFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysStaffOrgQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("所有数据列表") + @PostMapping("/staffinfoList") + public ResultBean> staffinfoList(@RequestBody SysStaffOrgQuery query); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysStaffOrgDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysStaffOrgDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("根据员工sid获取部门信息") + @ResponseBody + @GetMapping("/getSysStaffOrgListByStaffSid/{staffSid}") + public ResultBean> getSysStaffOrgListByStaffSid(@PathVariable("staffSid") String staffSid); + + @ApiOperation("根据员工sid获取部门sid列表") + @ResponseBody + @GetMapping("/getSysStaffOrgSidListByStaffSid/{staffSid}") + public ResultBean getSysStaffOrgSidListByStaffSid(@PathVariable("staffSid") String staffSid); + + + @GetMapping("/selectAllByStaffSid") + @ResponseBody + @ApiModelProperty("根据员工sid获取主管部门信息") + ResultBean selectAllByStaffSid(@RequestParam(value = "staffSid") String staffSid); + + /** + * 根据用户sid获取分公司sid + * + * @param applySid 用户sid + * @return + */ + @GetMapping("/getPathSidByUserSid") + @ResponseBody + @ApiOperation("根据用户sid获取分公司sid") + ResultBean getPathSidByUserSid(@RequestParam(value = "userSid") String applySid); + + @GetMapping("/selectSidPathByStaffSid") + @ResponseBody + @ApiOperation("根据人员sid获取分公司sid") + ResultBean selectSidPathByStaffSid(@RequestParam(value = "applySid") String applySid); + + @GetMapping("/getOrgSidBySid") + @ResponseBody + @ApiOperation("根据组织sid获取分公司sid") + ResultBean getOrgSidBySid(@RequestParam(value = "orgSid") String orgSid); + @GetMapping("/getOrgByStaffSid") + @ResponseBody + @ApiOperation("根据组织staffSid获取分公司SysStaffOrg") + ResultBean getOrgByStaffSid(@RequestParam(value = "staffSid") String staffSid); + + @GetMapping("/getOrgSidByPath") + @ResponseBody + @ApiOperation("根据用户组织全路径获取用户的分公司sid") + ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java new file mode 100644 index 00000000..3cecb5db --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -0,0 +1,112 @@ +package com.yxt.anrui.portal.api.sysstafforg; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeignFallback
+ * Description: 员工部门关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstafforg/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysStaffOrgQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstafforg/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstafforg/list无法访问"); + } + + @Override + public ResultBean> staffinfoList(SysStaffOrgQuery query) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstafforg/staffinfoList无法访问"); + } + + @Override + public ResultBean save(SysStaffOrgDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstafforg/save无法访问"); + } + + @Override + public ResultBean update(SysStaffOrgDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstafforg/update无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstafforg/del无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstafforg/fetch无法访问"); + } + + @Override + public ResultBean getSysStaffOrgListByStaffSid(String staffSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstafforg/getSysStaffOrgListByStaffSid无法访问"); + } + + @Override + public ResultBean getSysStaffOrgSidListByStaffSid(String staffSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstafforg/getSysStaffOrgSidListByStaffSid无法访问"); + } + + @Override + public ResultBean selectSidPathByStaffSid(String applySid) { + return null; + } + + @Override + public ResultBean getOrgSidBySid(String orgSid) { + return null; + } + + @Override + public ResultBean getOrgByStaffSid(String staffSid) { + return null; + } + + @Override + public ResultBean getOrgSidByPath(String orgPath) { + return null; + } + + @Override + public ResultBean selectAllByStaffSid(String staffSid) { + return null; + } + + @Override + public ResultBean getPathSidByUserSid(String applySid) { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgQuery.java new file mode 100644 index 00000000..3cd8f32b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgQuery.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.portal.api.sysstafforg; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgQuery.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgQuery
+ * Description: 员工部门关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表 查询条件", description = "员工部门关联表 查询条件") +@Data +public class SysStaffOrgQuery implements Query { + + + @ApiModelProperty("部门sid") + private String orgSid; + + @ApiModelProperty("部门名称") + private String orgName; + + @ApiModelProperty("人员sid") + private String staffSid; + + @ApiModelProperty("部门路径") + private String orgSidPath; + + @ApiModelProperty("部门名称路径") + private Integer orgNamePath; + + @ApiModelProperty("管理类型：1、主管。2、分管。3、员工") + private String manageType; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgVo.java new file mode 100644 index 00000000..8454f39e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgVo.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.portal.api.sysstafforg; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgVo.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo
+ * Description: 员工部门关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表 视图数据对象", description = "员工部门关联表 视图数据对象") +@Data +public class SysStaffOrgVo implements Vo { + + + @ApiModelProperty("部门sid") + private String orgSid; + + @ApiModelProperty("部门名称") + private String orgName; + + @ApiModelProperty("人员sid") + private String staffSid; + + @ApiModelProperty("部门路径") + private String orgSidPath; + + @ApiModelProperty("部门名称路径") + private String orgNamePath; + + @ApiModelProperty("管理类型：1、主管。2、分管。3、员工") + private String manageType; + @ApiModelProperty("员工姓名") + private String staffName; + @ApiModelProperty("员工手机号") + private String mobile; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPost.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPost.java new file mode 100644 index 00000000..4d7fb840 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPost.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPost.java
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost
+ * Description: 员工岗位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工岗位关联表", description = "员工岗位关联表") +@TableName("sys_staff_post") +@Data +public class SysStaffPost extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("员工sid") + private String staffSid; + + @ApiModelProperty("所属部门sid") + private String orgSid; + + @ApiModelProperty("就任岗位") + private String postSid; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("任岗开始日期") + private Date startDate; + + @ApiModelProperty("是否主任岗：1是、0否") + private Integer isDepetHead; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDetailsVo.java new file mode 100644 index 00000000..19867dfc --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDetailsVo.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/2/11 16:16 + * @Description 员工岗位详情 + */ +@Data +public class SysStaffPostDetailsVo implements Vo { + private static final long serialVersionUID = 715449809179360019L; + + @ApiModelProperty("就任岗位") + private String postSid; + @ApiModelProperty("是否主任岗：1是、0否") + private Integer isDepetHead; + @ApiModelProperty(value = "岗位编码") + private String postCode; + @ApiModelProperty(value = "岗位名称") + private String name; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDto.java new file mode 100644 index 00000000..54eac485 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostDto.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostDto.java
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto
+ * Description: 员工岗位关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工岗位关联表 数据传输对象", description = "员工岗位关联表 数据传输对象") +@Data +public class SysStaffPostDto implements Dto { + + private static final long serialVersionUID = -243797759737403877L; + @ApiModelProperty("就任岗位") + private String postSid; + @ApiModelProperty(value = "岗位编码", required = true) + @NotBlank(message = "岗位编码不能为空") + private String postCode; + @ApiModelProperty("是否主任岗：1是、0否") + private Integer isDepetHead; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java new file mode 100644 index 00000000..844bf710 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeign.java @@ -0,0 +1,68 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostFeign.java
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign
+ * Description: 员工岗位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "员工岗位关联表") +@FeignClient( + contextId = "supervise-portal-SysStaffPost", + name = "supervise-portal", + path = "v1/sysstaffpost", + fallback = SysStaffPostFeignFallback.class) +public interface SysStaffPostFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysStaffPostQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysStaffPostDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysStaffPostDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("根据员工sid查询岗位信息") + @GetMapping("/selectPost/{sid}") + ResultBean selectPost(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java new file mode 100644 index 00000000..8788c28e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostFeignFallback.java @@ -0,0 +1,69 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeignFallback
+ * Description: 员工岗位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysStaffPostFeignFallback implements SysStaffPostFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysStaffPostQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/list无法访问"); + } + + @Override + public ResultBean save(SysStaffPostDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/save无法访问"); + } + + @Override + public ResultBean update(SysStaffPostDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/update无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffpost/del无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysstaffpost/fetch无法访问"); + } + + @Override + public ResultBean selectPost(String sid) { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostQuery.java new file mode 100644 index 00000000..11d7fd58 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostQuery.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostQuery.java
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostQuery
+ * Description: 员工岗位关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工岗位关联表 查询条件", description = "员工岗位关联表 查询条件") +@Data +public class SysStaffPostQuery implements Query { + + + @ApiModelProperty("员工sid") + private String staffSid; + + @ApiModelProperty("所属部门sid") + private String orgSid; + + @ApiModelProperty("就任岗位") + private String postSid; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("任岗开始日期") + private Date startDateStart; + private Date startDateEnd; + + @ApiModelProperty("是否主任岗：1是、0否") + private Integer isDepetHead; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVo.java new file mode 100644 index 00000000..4d5f35fb --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffpost/SysStaffPostVo.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.portal.api.sysstaffpost; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostVo.java
+ * Class: com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo
+ * Description: 员工岗位关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工岗位关联表 视图数据对象", description = "员工岗位关联表 视图数据对象") +@Data +public class SysStaffPostVo implements Vo { + + + @ApiModelProperty("员工sid") + private String staffSid; + + @ApiModelProperty("所属部门sid") + private String orgSid; + + @ApiModelProperty("就任岗位") + private String postSid; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("任岗开始日期") + private Date startDateStart; + private Date startDateEnd; + + @ApiModelProperty("是否主任岗：1是、0否") + private Integer isDepetHead; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUser.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUser.java new file mode 100644 index 00000000..b9528fe3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUser.java @@ -0,0 +1,68 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUser.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUser
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表", description = "用户表") +@TableName("sys_user") +@Data +public class SysUser extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("登录名，登录名不能相同") + private String userName; + + @ApiModelProperty("密码（加密或签名后）") + private String password; + + @ApiModelProperty("密码修改时限") + private String pwdDayslimit; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("最后一次密码修改时间") + private Date pwdModifyTime; + + @ApiModelProperty("在线状态（0为离线、1为在线）") + private Integer onlineState; + + @ApiModelProperty("用户登录时随机生成身份验证字符串") + private String token; + + @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员") + private String isAdmin; + + @ApiModelProperty("手机登录唯一标识，手机与用户绑定字段") + private String appId; + + @ApiModelProperty("关联的人员sid") + private String staffSid; + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("用户类型:1员工、2客户、3供应商") + private Integer userType; + + @ApiModelProperty("用户头像") + private String headImage; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserDto.java new file mode 100644 index 00000000..7b183ac3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserDto.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.portal.api.sysuser; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserDto.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserDto
+ * Description: 用户表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象") +@Data +public class SysUserDto implements Dto { + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty("用户类型:1员工、2客户、3供应商") + private Integer userType; + @ApiModelProperty(value = "姓名", required = true) + @NotBlank(message = "姓名不能为空") + private String name; + @ApiModelProperty(value = "验证码", required = true) + @NotBlank(message = "验证码不能为空") + private String verificationCode; + @ApiModelProperty(value = "部门sid") + private String deptSid; + @ApiModelProperty(value = "岗位sid") + private String postSid; + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java new file mode 100644 index 00000000..4a8ea9fd --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeign.java @@ -0,0 +1,235 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +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.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserFeign.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserFeign
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "用户表") +@FeignClient( + contextId = "supervise-portal-SysUser", + name = "supervise-portal", + path = "v1/sysuser", + fallback = SysUserFeignFallback.class) +public interface SysUserFeign { + + @ApiOperation("根据条件分页查询数据的列表 ") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysUserQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@Valid @RequestBody SysUserDto dto); + + @ApiOperation("根据staffSid删除用户（逻辑删除）") + @PostMapping("/delSysUserByMobile") + public ResultBean delSysUserByMobile(@RequestParam("sid") String sid); + + @ApiOperation("根据staffSid查询用户信息") + @PostMapping("/getSysUserByMobile") + public ResultBean getSysUserByMobile(@RequestParam("staffSid") String staffSid); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SysUserDto dto, @PathVariable("sid") String sid); + + /** + * 修改密码(★) + * + * @param original 原始密码 + * @param password 密码 + * @param confirmPassword 确认密码 + * @param userSid 用户sid + * @return + */ + @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); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("删除记录根据sid") + @GetMapping("/delBySid/{sid}") + public ResultBean delBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据用户名（手机号）查询用户") + @GetMapping("/fetchByMobile/{mobile}") + public ResultBean selectByUserName(@PathVariable("mobile") String mobile); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("根据sid获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据多个或者一个sid获取对应的用户集合") + @GetMapping("/fetchBySids/{sids}") + public ResultBean> fetchBySids(@PathVariable("sids") String sids); + + /** + * 客户端找回密码 + * + * @param userName,userPhone + * @return + */ + @ApiOperation("客户端找回密码") + @PostMapping("/reGetPwd") + public ResultBean reGetPwd(@RequestParam("userName") String userName, @RequestParam("userPhone") String userPhone); + + /** + * 初始化密码 + * + * @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); + + @PostMapping("/login") + @ResponseBody + @ApiOperation(value = "3、登录") + @ApiOperationSupport(order = 30) + public ResultBean login(@RequestBody SysUserQuery sysUserQuery); + + @PostMapping("/loginByNoVeriCode") + @ResponseBody + @ApiOperation(value = "3、登录无验证码") + @ApiOperationSupport(order = 30) + public ResultBean loginByNoVeriCode(@RequestBody SysUserQuery sysUserQuery); + + /** + * 退出登录 + * + * @return + */ + @PostMapping("/signOut") + @ResponseBody + @ApiOperation(value = "退出登录") + @ApiOperationSupport(order = 30) + public ResultBean signOut(HttpServletRequest httpServletRequest); + + @ApiOperation("发送短信验证码") + @GetMapping("/sendMessageCode/{mobile}") + public ResultBean sendMessageCode(@PathVariable("mobile") String mobile); + + @ApiOperation("根据staffsid查询用户") + @ResponseBody + @GetMapping("/selectByStaffsid/{staffsid}") + public ResultBean selectByStaffsid(@PathVariable("staffsid") String staffsid); + + @ApiOperation("根据sid查询用户信息") + @PostMapping("/selectBySid") + public ResultBean selectBySid(@RequestParam("sid") String sid); + + @PostMapping(value = "/loginDetails", headers = "token") + @ApiOperation("根据token值获取登录后的用户信息") + public ResultBean loginDetails(HttpServletRequest httpServletRequest); + + @ApiOperation(value = "根据用户sid获取orgSid(多个时取第一个)") + @ResponseBody + @GetMapping("/getUserOrgInfoByUserSid/{userSid}") + public ResultBean getUserOrgInfoByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation(value = "根据用户的sid查询用户的组织信息") + @ResponseBody + @GetMapping("/selectUserInfoByUserSid/{userSid}") + public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation(value = "根据用户的sid查询用户的组织信息") + @ResponseBody + @GetMapping("/selectUserInfoByUserSid/{userSid}/{orgSid}") + public ResultBean selectUserInfoByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid); + + @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); + + @ApiOperation("根据角色sid查询用户") + @GetMapping("/getUsersByRoleSid/{roleSid}") + ResultBean getUsersByRoleSid(@PathVariable("roleSid") String roleSid); + + @ApiOperation(value = "获取本机构链角色的用户") + @GetMapping(value = "getUserByRole") + ResultBean> getUserByRole(@SpringQueryMap UserQuery query); + + /** + * 参数：当前用户角色sid，部门sid + * + * @param query + * @return + */ + @ApiOperation(value = "获取本部门直属上级角色的用户") + @GetMapping(value = "getUserByOrgRole") + ResultBean> getUserByOrgRole(@SpringQueryMap UserRoleQuery query); + + /** + * 参数为下一环节角色sid，机构sid + * + * @param query + * @return + */ + @ApiOperation(value = "获取其他机构链角色的用户") + @GetMapping(value = "getOtherOrgRoleUser") + ResultBean> getOtherOrgRoleUser(@SpringQueryMap UserRoleQuery query); + + @ApiOperation(value = "获取当前分公司下所有员工的userSid和员工姓名") + @GetMapping(value = "getUserByOrgSid") + ResultBean>> getUserByOrgSid(@RequestParam("orgSid") String orgSid, @RequestParam("userSid") String userSid); + + @ApiOperation(value = "根据用户sid获取用户id") + @PostMapping(value = "selectIdBySid") + ResultBean selectIdBySid(@RequestBody List stringList); + + @ApiOperation(value = "根据用户sid查询该分公司下所有销售经理的用户") + @GetMapping(value = "selectSysUserList") + ResultBean> selectSysUserList(@RequestParam("userSid") String userSid); + @ApiOperation(value = "查询是否需要更换密码") + @GetMapping(value = "/selectPasswordByUserSid/{userSid}") + ResultBean selectPasswordByUserSid(@PathVariable("userSid")String userSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java new file mode 100644 index 00000000..a021f1fc --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserFeignFallback.java @@ -0,0 +1,217 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +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 javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserFeignFallback
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysUserFeignFallback implements SysUserFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysUserQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/list无法访问"); + } + + @Override + public ResultBean save(SysUserDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/save无法访问"); + } + + @Override + public ResultBean delSysUserByMobile(String sid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/delSysUserByMobile无法访问"); + } + + @Override + public ResultBean getSysUserByMobile(String staffSid) { + return null; + } + + @Override + public ResultBean update(SysUserDto dto,String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/update无法访问"); + } + + @Override + public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/updatePassword无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuser/del无法访问"); + } + + @Override + public ResultBean delBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/delBySid无法访问"); + } + + @Override + public ResultBean selectByUserName(String mobile) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/fetchByMobile无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/fetchBySid无法访问"); + } + + @Override + public ResultBean> fetchBySids(String sids) { + return null; + } + + @Override + public ResultBean reGetPwd(String userName, String userPhone) { + return null; + } + + @Override + public ResultBean initPwd(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/initPwd无法访问"); + } + + @Override + public ResultBean login(SysUserQuery sysUserQuery) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/login无法访问"); + } + + @Override + public ResultBean loginByNoVeriCode(SysUserQuery sysUserQuery) { + return null; + } + + @Override + public ResultBean signOut(HttpServletRequest httpServletRequest) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/signOut无法访问"); + } + + @Override + public ResultBean sendMessageCode(String mobile) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/sendMessageCode无法访问"); + } + + @Override + public ResultBean selectByStaffsid(String staffsid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/selectByStaffsid无法访问"); + } + + @Override + public ResultBean selectBySid(String sid) { + return null; + } + + @Override + public ResultBean loginDetails(HttpServletRequest httpServletRequest) { + return null; + } + + @Override + public ResultBean getUserOrgInfoByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/getUserOrgInfoByUserSid无法访问"); + } + + @Override + public ResultBean selectUserInfoByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuser/selectUserInfoByUserSid无法访问"); + } + + @Override + public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) { + return null; + } + + @Override + public ResultBean setIsEnable(String sid, String isEnable) { + return null; + } + + @Override + public ResultBean getUsersByRoleSid(String roleSid) { + return null; + } + + @Override + public ResultBean> getUserByRole(UserQuery query) { + return null; + } + + @Override + public ResultBean> getUserByOrgRole(UserRoleQuery query) { + return null; + } + + @Override + public ResultBean> getOtherOrgRoleUser(UserRoleQuery query) { + return null; + } + + @Override + public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { + return null; + } + + @Override + public ResultBean selectIdBySid(List stringList) { + return null; + } + + @Override + public ResultBean> selectSysUserList(String userSid) { + return null; + } + + @Override + public ResultBean selectPasswordByUserSid(String userSid) { + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java new file mode 100644 index 00000000..1b76779b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserInfoVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/2/9 9:12 + * @Description 用户组织信息 + */ +@Data +public class SysUserInfoVo implements Vo { + + private static final long serialVersionUID = 7931121025686046432L; + @ApiModelProperty("关联的员工sid") + private String staffSid; + + @ApiModelProperty("关联的员工名称") + private String staffName; + + @ApiModelProperty("员工的组织sid（多个时为第一个）") + private String orgSid; + + @ApiModelProperty("员工的组织名称（多个时为第一个）") + private String orgName; + + @ApiModelProperty("员工的组织部门编码") + private String orgCode; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java new file mode 100644 index 00000000..e70c73e4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserListVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/14 15:36 + * @Description + */ +@Data +public class SysUserListVo implements Vo { + private static final long serialVersionUID = -3047907553025391436L; + + private String name; + + private String sid; + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java new file mode 100644 index 00000000..a62cd25c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java @@ -0,0 +1,51 @@ +package com.yxt.anrui.portal.api.sysuser; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserQuery.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserQuery
+ * Description: 用户表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 查询条件", description = "用户表 查询条件") +@Data +public class SysUserQuery implements Query { + + + @ApiModelProperty("角色sid") + private String roleSid; + @ApiModelProperty("用户名称") + private String userName; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("部门名称") + private String orgName; + + @ApiModelProperty("密码（加密或签名后）") + private String password; + + @ApiModelProperty("用户登录时随机生成身份验证字符串") + private String token; + @ApiModelProperty("用户登录时随机生成的验证码字符串") + private String verifyCode; + private String uuid; + + @ApiModelProperty("手机登录唯一标识，手机与用户绑定字段") + private String appId; + @ApiModelProperty("手机登录类型：1、密码登录2、验证码登录") + private String type; + @ApiModelProperty(value = "是否是测试",example = "false") + private Boolean isTest; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java new file mode 100644 index 00000000..1c60e344 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserVo.java @@ -0,0 +1,93 @@ +package com.yxt.anrui.portal.api.sysuser; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.portal.api.sysuser.app.OrgList; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserVo.java
+ * Class: com.yxt.anrui.portal.api.sysuser.SysUserVo
+ * Description: 用户表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象") +@Data +@NoArgsConstructor +public class SysUserVo implements Vo { + private static final long serialVersionUID = 2415131854581950721L; + @ApiModelProperty("部门sid") + private String departmentSid; + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("上级部门名称-本级部门名称 岗位名称") + @JsonProperty("pNameAndDepartmentNameAndPostName") + private String pNameAndDepartmentNameAndPostName; + @ApiModelProperty("岗位名称") + private String postName; + @ApiModelProperty("岗位Sid") + private String postSid; + @ApiModelProperty("单位sid") + private String organizationSid; + @ApiModelProperty("单位名称") + private String organizationName; + @ApiModelProperty("用户姓名") + private String name; + @ApiModelProperty("登录名，登录名不能相同") + private String userName; + + @ApiModelProperty("id") + private Integer id; + @ApiModelProperty("用户sid") + private String sid; + @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员") + private String isAdmin; + @ApiModelProperty("角色名称") + private String roleName; + + @ApiModelProperty("关联的人员sid") + private String staffSid; + + @ApiModelProperty("手机号") + private String mobile; + @ApiModelProperty(value = "禁用状态") + private String isEnable; + + @ApiModelProperty("用户类型:1员工、2客户、3供应商") + private String userType; + @ApiModelProperty("用户类型:1、2、3") + private String userTypeKey; + @ApiModelProperty("用户头像") + private String headImage; + @ApiModelProperty("组织名称") + private String orgNamePath; + @ApiModelProperty("组织sid") + private String orgSidPath; + @ApiModelProperty(value = "token") + private String token; + @ApiModelProperty(value = "角色sids") + private List roleSids = new ArrayList<>(); + + private List orgList = new ArrayList<>(); + private String defaultOrgPath; + private String defaultOrgPathName; + + @ApiModelProperty("是否需要更换密码") + private Boolean needResetPsd; + @ApiModelProperty("工号") + private String jobNumber; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java new file mode 100644 index 00000000..20b9fa77 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserQuery.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/21 8:47 + * @Description + */ +@Data +public class UserQuery implements Query { + + private static final long serialVersionUID = -3979717077029562761L; + @ApiModelProperty(value = "角色sid必传项") + private String roleSid; + @ApiModelProperty(value = "用户部门sid路径是必传项") + private String orgSidPath; + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserRoleQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserRoleQuery.java new file mode 100644 index 00000000..9800a2ea --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/UserRoleQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.portal.api.sysuser; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/8/25 8:38 + * @Description + */ +@Data +public class UserRoleQuery implements Query { + private static final long serialVersionUID = 1913450300189800653L; + + @ApiModelProperty("角色sid") + private String roleSid; + private String orgSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppMySysUserInfo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppMySysUserInfo.java new file mode 100644 index 00000000..eda39171 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppMySysUserInfo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.portal.api.sysuser.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/14 + */ +@ApiOperation(value = "App我的信息") +@Data +public class AppMySysUserInfo implements Vo { + + @ApiModelProperty("id") + private String id; + @ApiModelProperty("用户姓名") + private String name; + @ApiModelProperty("用户头像") + private String headImage; + + @ApiModelProperty("职位") + private String position; + @ApiModelProperty("部门") + private String department; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java new file mode 100644 index 00000000..eff2cc4e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeign.java @@ -0,0 +1,86 @@ +package com.yxt.anrui.portal.api.sysuser.app; + +import com.yxt.anrui.portal.api.sysuser.SysUserQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; + +/** + * 手机端用户登录、注册接口 + * + * @Author liuguohui + * @Date 2021/9/3 + */ +@Api(tags = "用户表") +@FeignClient( + contextId = "supervise-portal-appUser", + name = "supervise-portal", + path = "v1/appuser", + fallback = AppSysUserFeignFallback.class) +public interface AppSysUserFeign { + + @PostMapping("/login") + @ResponseBody + @ApiOperation(value = "1、app用户登录") + public ResultBean login(@RequestBody SysUserQuery sysUserQuery); + + @ApiOperation(value = "手机发送验证码(登录、修改密码、找回密码)") + @ResponseBody + @PostMapping("/sendVerificationCodeForApp") + public ResultBean sendVerificationCodeForApp(@RequestParam("mobile") String mobile, @RequestParam("type") String type, + @RequestParam("appId") String appId); + + @ApiOperation(value = "我的信息") + @ResponseBody + @GetMapping("/getMyInfo/{userSid}") + public ResultBean getMyInfo(@PathVariable("userSid") String userSid); + + @ApiOperation(value = "我的信息:切换机构") + @ResponseBody + @GetMapping("/getMyInfo") + public ResultBean getMyInfo(@SpringQueryMap MyInfoQuery myInfoQuery); + + @ApiOperation(value = "手机更改密码") + @ResponseBody + @PostMapping("/updatePassword") + public ResultBean updatePassword(@RequestParam(value = "userSid", required = true) String userSid, + @RequestParam(value = "appId", required = true) String appId, + @RequestParam(value = "oldPassword", required = true) String oldPassword, + @RequestParam(value = "newPassword", required = true) String newPassword, + HttpServletRequest httpServletRequest); + + @ApiOperation(value = "手机找回密码验证验证码") + @ResponseBody + @PostMapping("/checkResetPwdCode") + public ResultBean checkResetPwdCode(@RequestParam(value = "resetPwdCode", required = true) String resetPwdCode, + @RequestParam(value = "mobile", required = true) String mobile); + + @ApiOperation(value = "手机端找回密码") + @ResponseBody + @PostMapping("/resetPwd") + public ResultBean resetPwdApp(@RequestParam(value = "mobile", required = true) String mobile, + @RequestParam(value = "newPwd", required = true) String newPwd, + HttpServletRequest httpServletRequest); + + @ApiOperation(value = "手机修改用户头像") + @ResponseBody + @PostMapping("/updateHeadImage") + public ResultBean updateHeadImage(@RequestParam("file") MultipartFile multipartFile, @RequestParam("userSid") String userSid); + + @ApiOperation(value = "手机端根据token获取userSid") + @ResponseBody + @PostMapping("/getUserSidByToken") + public ResultBean getUserSidByToken(@RequestParam("token") String token); + + @ApiOperation(value = "解绑某个用户或解绑所有的用户") + @ResponseBody + @PutMapping("/updateAppId") + ResultBean updateAppId(@RequestParam(value = "mobile", required = false) String mobile); +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java new file mode 100644 index 00000000..d42c2244 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppSysUserFeignFallback.java @@ -0,0 +1,68 @@ +package com.yxt.anrui.portal.api.sysuser.app; + +import com.yxt.anrui.portal.api.sysuser.SysUserQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.common.core.result.ResultBean; +import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/3 + */ +@Component +public class AppSysUserFeignFallback implements AppSysUserFeign { + + @Override + public ResultBean login(SysUserQuery userQuery) { + return new ResultBean().fail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean sendVerificationCodeForApp(String mobile, String type, String appId) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean getMyInfo(String userSid) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean getMyInfo(MyInfoQuery myInfoQuery) { + return null; + } + + @Override + public ResultBean updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean checkResetPwdCode(String resetPwdCode, String mobile) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean resetPwdApp(String mobile, String newPwd,HttpServletRequest httpServletRequest) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean updateHeadImage(MultipartFile multipartFile, String userSid) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean getUserSidByToken(String token) { + return ResultBean.fireFail().setMsg("网站维护，请稍后再试"); + } + + @Override + public ResultBean updateAppId(String mobile) { + return null; + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppUserOrgInfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppUserOrgInfoVo.java new file mode 100644 index 00000000..7faf917e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/AppUserOrgInfoVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.sysuser.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +/** + * @Description + * @Author liuguohui + * @Date 2021/12/17 + */ +@ApiOperation("用户组织信息") +@Data +public class AppUserOrgInfoVo implements Vo { + + @ApiModelProperty("关联的员工sid") + private String staffSid; + + @ApiModelProperty("关联的员工名称") + private String staffName; + + @ApiModelProperty("员工的组织sid（多个时为第一个）") + private String orgSid; + + @ApiModelProperty("员工的组织名称（多个时为第一个）") + private String orgName; + + @ApiModelProperty("员工的组织部门编码") + private String orgCode; + + @ApiModelProperty("部门路径") + private String orgSidPath; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java new file mode 100644 index 00000000..d2c07260 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/MyInfoQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.portal.api.sysuser.app; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/10/22 15:24 + * @Description + */ +@Data +public class MyInfoQuery implements Query { + private static final long serialVersionUID = -4771501933318214145L; + @ApiModelProperty("用户sid") + private String userSid; + @ApiModelProperty("组织机构sid") + private String orgPath; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java new file mode 100644 index 00000000..39509c80 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/app/OrgList.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.portal.api.sysuser.app; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/9/21 9:26 + * @Description + */ +@Data +public class OrgList implements Vo { + private static final long serialVersionUID = -2867882982421321776L; + + private String orgName; + private String orgPath; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java new file mode 100644 index 00000000..47d52b80 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxHomePageVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.portal.api.sysuser.wx; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/10/12 10:53 + * @description + */ +@Data +public class WxHomePageVo implements Vo { + private static final long serialVersionUID = 2116719971434282451L; + @ApiModelProperty(value = "头像") + private String headImage; + + @ApiModelProperty(value = "提醒") + private String message; + + @ApiModelProperty(value = "身份证有效期") + private String idTerm; + @ApiModelProperty(value = "是否有提示") + private Boolean isHave; + @ApiModelProperty(value = "客户sid") + private String staffSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxMySysUserInfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxMySysUserInfoVo.java new file mode 100644 index 00000000..b46297d1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxMySysUserInfoVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.portal.api.sysuser.wx; + +import com.yxt.common.core.utils.desensitized.Sensitive; +import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/10/6 9:12 + * @description 客户端我的页面 + */ +@Data +public class WxMySysUserInfoVo implements Vo { + private static final long serialVersionUID = 6495105262502269503L; + + @ApiModelProperty(value = "姓名") + @Sensitive(type = SensitiveTypeEnum.CHINESE_NAME) + private String name; + @ApiModelProperty(value = "头像") + private String headImage; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserDto.java new file mode 100644 index 00000000..53dcca4b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserDto.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.portal.api.sysuser.wx; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; + +/** + * @author dimengzhe + * @date 2021/10/5 13:31 + * @description + */ +@Data +public class WxSysUserDto implements Dto { + private static final long serialVersionUID = -3446342255009165324L; + + @ApiModelProperty(value = "手机号", required = true) + @NotBlank(message = "手机号不能为空") + @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$", message = "手机号码格式不正确") + private String mobile; + @ApiModelProperty(value = "验证码", required = true) + @NotBlank(message = "验证码不能为空") + private String verificationCode; + @ApiModelProperty(value = "姓名", required = true) + @NotBlank(message = "姓名不能为空") + private String name; + @ApiModelProperty(value = "身份证号", required = true) + @NotBlank(message = "身份证号不能为空") + private String idNo; + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeign.java new file mode 100644 index 00000000..2e565ee2 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeign.java @@ -0,0 +1,116 @@ +package com.yxt.anrui.portal.api.sysuser.wx; + +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @author dimengzhe + * @date 2021/10/5 13:09 + * @description 客户端接口 + */ +@FeignClient( + contextId = "supervise-portal-WxUser", + name = "supervise-portal", + path = "v1/wxuser", + fallback = WxSysUserFeignFallback.class) +public interface WxSysUserFeign { + + /** + * @param mobile 手机号 + * @param type 类型:1、注册，2、登录 3、忘记密码 + * @description: 获取验证码 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 14:29 + */ + @ApiImplicitParams({ + @ApiImplicitParam(name = "mobile", value = "手机号", required = true), + @ApiImplicitParam(name = "type", value = "类型:1、注册，2、登录 3、忘记密码 4、旧手机号获取验证码、5新手机号", required = true), + }) + @ApiOperation(value = "获取验证码(1、注册，2、登录 3、忘记密码)") + @GetMapping("/sendMessageCode") + @ResponseBody + public ResultBean sendMessageCode(@RequestParam("mobile") String mobile, + @RequestParam("type") String type); + + /** + * @param wxSysUserLoginQuery 数据传输对象 + * @description: 免密码登录、账号登录 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/9 9:13 + */ + @ApiOperation(value = "登录") + @ResponseBody + @PostMapping("/login") + ResultBean login(@Valid @RequestBody WxSysUserLoginQuery wxSysUserLoginQuery); + + /** + * @param wxSysUserDto 数据传输对象 + * @description: 客户端注册 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 14:29 + */ + @ApiOperation(value = "注册") + @ResponseBody + @PostMapping("/registsUser") + public ResultBean registsUser(@Valid @RequestBody WxSysUserDto wxSysUserDto); + + /** + * @param userSid 用户sid + * @description: 我的信息 + * @return: 头像和加密后的姓名 + * @author: dimengzhe + * @time: 2021/10/6 10:58 + */ + @ApiOperation(value = "我的信息") + @ResponseBody + @GetMapping("/myInfo/{userSid}") + ResultBean selectMyInfo(@PathVariable("userSid") String userSid); + + @ApiOperation(value = "首页") + @ResponseBody + @GetMapping("/selectHomePage/{userSid}") + ResultBean selectHomePage(@PathVariable("userSid") String userSid); + + @ApiOperation(value = "客户端验证验证码是否正确") + @ResponseBody + @PostMapping("/checkResetPwdCode") + @ApiImplicitParams({ + @ApiImplicitParam(name = "code", value = "验证码", required = true), + @ApiImplicitParam(name = "mobile", value = "手机号", required = true), + @ApiImplicitParam(name = "type", value = "类型:1、找回密码 2、验证旧手机号的验证码、3、验证新手机好的验证码", required = true) + }) + public ResultBean checkResetPwdCode(@RequestParam(value = "code", required = true) String code, + @RequestParam(value = "mobile", required = true) String mobile, + @RequestParam(value = "type", required = true) String type); + + /** + * @param mobile 手机号 + * @param newPwd 新密码 + * @description: + * @return: + * @Author: dimengzhe + * @Date: 2021/10/9 9:21 + */ + @ApiOperation(value = "客户端找回密码") + @ResponseBody + @PostMapping("/resetPwd") + public ResultBean resetPwdWx(@RequestParam(value = "mobile", required = true) String mobile, + @RequestParam(value = "newPwd", required = true) String newPwd); + + @ApiOperation(value = "根据用户sid查询用户信息") + @ResponseBody + @PostMapping("/selectBySid") + ResultBean selectBySid(@RequestParam(value = "sid") String sid); + + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeignFallback.java new file mode 100644 index 00000000..0b8e632f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.portal.api.sysuser.wx; + +import org.springframework.stereotype.Component; + +/** + * @author dimengzhe + * @date 2021/10/5 13:10 + * @description + */ +@Component +public class WxSysUserFeignFallback { +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserLoginQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserLoginQuery.java new file mode 100644 index 00000000..27d9f106 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserLoginQuery.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.portal.api.sysuser.wx; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @author dimengzhe + * @date 2021/10/6 14:31 + * @description + */ +@Data +public class WxSysUserLoginQuery implements Query { + private static final long serialVersionUID = -3754864114501469472L; + @ApiModelProperty(value = "用户名或手机号", required = true) + @NotBlank(message = "用户名不能为空") + private String userName; + @ApiModelProperty(value = "手机登录类型：1、密码登录，2、验证码登录", required = true) + @NotBlank(message = "手机登录类型不能为空") + private String type; + + @ApiModelProperty(value = "密码") + private String password; + + @ApiModelProperty(value = "验证码") + private String verifyCode; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserVo.java new file mode 100644 index 00000000..185a3868 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/wx/WxSysUserVo.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.portal.api.sysuser.wx; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dimengzhe + * @date 2021/10/6 14:52 + * @description + */ +@Data +public class WxSysUserVo implements Vo { + private static final long serialVersionUID = 1700823767702299465L; + /*若为员工，则为人员sid。若为客户，则为客户sid。若为供应厂商，则为供应厂商的sid*/ + @ApiModelProperty(value = "关联的客户sid") + private String staffSid; + + @ApiModelProperty(value = "手机号") + private String mobile; + + @ApiModelProperty(value = "用户类型:1员工、2客户、3供应商") + private String userType; + + @ApiModelProperty(value = "用户sid") + private String userSid; + + @ApiModelProperty(value = "登录名，登录名不能相同") + private String userName; + @ApiModelProperty(value = "用户姓名") + private String name; + + @ApiModelProperty(value = "token") + private String token; + + @ApiModelProperty(value = "未读数量",example = "1") + private String num; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRole.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRole.java new file mode 100644 index 00000000..8f523bfc --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRole.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.portal.api.sysuserrole; + +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: SysUserRole.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRole
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表", description = "用户与角色关联表") +@TableName("sys_user_role") +@Data +public class SysUserRole extends BaseEntity { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleDto.java new file mode 100644 index 00000000..9e05eded --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysuserrole; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleDto.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto
+ * Description: 用户与角色关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表 数据传输对象", description = "用户与角色关联表 数据传输对象") +@Data +public class SysUserRoleDto implements Dto { + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java new file mode 100644 index 00000000..c7a8a061 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeign.java @@ -0,0 +1,74 @@ +package com.yxt.anrui.portal.api.sysuserrole; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "用户与角色关联表") +@FeignClient( + contextId = "supervise-portal-SysUserRole", + name = "supervise-portal", + path = "v1/sysuserrole", + fallback = SysUserRoleFeignFallback.class) +public interface SysUserRoleFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SysUserRoleQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SysUserRoleDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update") + public ResultBean update(@RequestBody SysUserRoleDto dto); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("根据用户sid和角色sid删除记录") + @GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}") + public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid, + @PathVariable("roleSid")String roleSid); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid); + + @ApiOperation("根据角色sid查询用户id列表") + @GetMapping("/getUserIdListByRoleSid") + public ResultBean> getUserIdListByRoleSid(@RequestParam("roleList") List roleList); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java new file mode 100644 index 00000000..39d4a86a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleFeignFallback.java @@ -0,0 +1,81 @@ +package com.yxt.anrui.portal.api.sysuserrole; + +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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeignFallback
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SysUserRoleFeignFallback implements SysUserRoleFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuserrole/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SysUserRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuserrole/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuserrole/list无法访问"); + } + + @Override + public ResultBean save(SysUserRoleDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuserrole/save无法访问"); + } + + @Override + public ResultBean update(SysUserRoleDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuserrole/update无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuserrole/del无法访问"); + } + + @Override + public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) { + return ResultBean.fireFail().setMsg("接口anrui_portal/sysuserrole/delByUserSidAndRoleSid无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuserrole/fetch无法访问"); + } + + @Override + public ResultBean getUserRoleSidByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuserrole/getUserRoleByUserSid无法访问"); + } + + @Override + public ResultBean getUserIdListByRoleSid(List roleList) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/sysuserrole/getUserIdByRoleSid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleQuery.java new file mode 100644 index 00000000..5d00a16b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleQuery.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysuserrole; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleQuery.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery
+ * Description: 用户与角色关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表 查询条件", description = "用户与角色关联表 查询条件") +@Data +public class SysUserRoleQuery implements Query { + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleVo.java new file mode 100644 index 00000000..eeebadac --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuserrole/SysUserRoleVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.portal.api.sysuserrole; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleVo.java
+ * Class: com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo
+ * Description: 用户与角色关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "用户与角色关联表 视图数据对象", description = "用户与角色关联表 视图数据对象") +@Data +public class SysUserRoleVo implements Vo { + + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("角色sid") + private String roleSid; +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/Pszxpfsj.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/Pszxpfsj.java new file mode 100644 index 00000000..39ba99a3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/Pszxpfsj.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.pszxpfsj; + +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: supervise(宇信通监管)
+ * File: Pszxpfsj.java
+ * Class: com.yxt.supervise.portal.api.pszxpfsj.Pszxpfsj
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息", description = "采购订单商品信息") +@TableName("pszxpfsj") +public class Pszxpfsj extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("类型") + private String type; // 类型 + @ApiModelProperty("销售订单编号") + private String code; // 销售订单编号 + @ApiModelProperty("商品编码") + private String prodCode; // 商品编码 + @ApiModelProperty("商品条码") + private String prodBarCode; // 商品条码 + @ApiModelProperty("商品名称") + private String prodName; // 商品名称 + @ApiModelProperty("品牌代码") + private String brandCode; // 品牌代码 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("大类") + private String dalei; // 大类 + @ApiModelProperty("中类") + private String zhonglei; // 中类 + @ApiModelProperty("小类") + private String xiaolei; // 小类 + @ApiModelProperty("客户代码") + private String cutomerCode; // 客户代码 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("销售数量") + private String salesNum; // 销售数量 + @ApiModelProperty("销售渠道") + private String storeCode; // 销售渠道 + @ApiModelProperty("销售价格") + private String unitPrice; // 销售价格 + @ApiModelProperty("销售成本") + private String salesPrice; // 销售成本 + @ApiModelProperty("利润") + private String lirun; // 利润 + @ApiModelProperty("数据日期") + private String orderDate; // 数据日期 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDetailsVo.java new file mode 100644 index 00000000..5b3e4f88 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDetailsVo.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.pszxpfsj; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(宇信通监管)
+ * File: PszxpfsjVo.java
+ * Class: com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjVo
+ * Description: 采购订单商品信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 视图数据详情", description = "采购订单商品信息 视图数据详情") +public class PszxpfsjDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("类型") + private String type; // 类型 + @ApiModelProperty("销售订单编号") + private String code; // 销售订单编号 + @ApiModelProperty("商品编码") + private String prodCode; // 商品编码 + @ApiModelProperty("商品条码") + private String prodBarCode; // 商品条码 + @ApiModelProperty("商品名称") + private String prodName; // 商品名称 + @ApiModelProperty("品牌代码") + private String brandCode; // 品牌代码 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("大类") + private String dalei; // 大类 + @ApiModelProperty("中类") + private String zhonglei; // 中类 + @ApiModelProperty("小类") + private String xiaolei; // 小类 + @ApiModelProperty("客户代码") + private String cutomerCode; // 客户代码 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("销售数量") + private String salesNum; // 销售数量 + @ApiModelProperty("销售渠道") + private String storeCode; // 销售渠道 + @ApiModelProperty("销售价格") + private String unitPrice; // 销售价格 + @ApiModelProperty("销售成本") + private String salesPrice; // 销售成本 + @ApiModelProperty("利润") + private String lirun; // 利润 + @ApiModelProperty("数据日期") + private String orderDate; // 数据日期 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDto.java new file mode 100644 index 00000000..6d114f08 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjDto.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.pszxpfsj; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(宇信通监管)
+ * File: PszxpfsjDto.java
+ * Class: com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjDto
+ * Description: 采购订单商品信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 数据传输对象", description = "采购订单商品信息 数据传输对象") +public class PszxpfsjDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("类型") + private String type; // 类型 + @ApiModelProperty("销售订单编号") + private String code; // 销售订单编号 + @ApiModelProperty("商品编码") + private String prodCode; // 商品编码 + @ApiModelProperty("商品条码") + private String prodBarCode; // 商品条码 + @ApiModelProperty("商品名称") + private String prodName; // 商品名称 + @ApiModelProperty("品牌代码") + private String brandCode; // 品牌代码 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("大类") + private String dalei; // 大类 + @ApiModelProperty("中类") + private String zhonglei; // 中类 + @ApiModelProperty("小类") + private String xiaolei; // 小类 + @ApiModelProperty("客户代码") + private String cutomerCode; // 客户代码 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("销售数量") + private String salesNum; // 销售数量 + @ApiModelProperty("销售渠道") + private String storeCode; // 销售渠道 + @ApiModelProperty("销售价格") + private String unitPrice; // 销售价格 + @ApiModelProperty("销售成本") + private String salesPrice; // 销售成本 + @ApiModelProperty("利润") + private String lirun; // 利润 + @ApiModelProperty("数据日期") + private String orderDate; // 数据日期 + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjFeign.java similarity index 74% rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationFeign.java rename to yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjFeign.java index 359fd08e..a40f8599 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationFeign.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjFeign.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.supervise.portal.api.sysorganization; +package com.yxt.supervise.portal.api.pszxpfsj; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,35 +36,35 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * Project: yxt_supervise(宇信通监管)
- * File: SysOrganizationFeign.java
- * Class: com.supervise.api.sysorganization.SysOrganizationFeign
- * Description: 组织机构表.
+ * Project: supervise(宇信通监管)
+ * File: PszxpfsjFeign.java
+ * Class: com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjFeign
+ * Description: 采购订单商品信息.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
+ * Makedate: 2022-12-24 14:12:54
* - * @author dongjianzhao + * @author liupopo * @version 1.0 * @since 1.0 */ -@Api(tags = "组织机构表") +@Api(tags = "采购订单商品信息") @FeignClient( - contextId = "yxt-supervise-SysOrganization", - name = "yxt-supervise", - path = "v1/sysorganization", - fallback = SysOrganizationFeignFallback.class) -public interface SysOrganizationFeign { + contextId = "supervise-Pszxpfsj", + name = "supervise", + path = "v1/pszxpfsj", + fallback = PszxpfsjFeignFallback.class) +public interface PszxpfsjFeign { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody - public ResultBean save(@RequestBody SysOrganizationDto dto); + public ResultBean save(@RequestBody PszxpfsjDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @@ -74,5 +74,5 @@ public interface SysOrganizationFeign { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjFeignFallback.java similarity index 67% rename from yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationFeignFallback.java rename to yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjFeignFallback.java index 6155ef9f..239e2c1c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjFeignFallback.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.supervise.portal.api.sysorganization; +package com.yxt.supervise.portal.api.pszxpfsj; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -33,40 +33,40 @@ import org.springframework.stereotype.Component; import java.util.List; /** - * Project: yxt_supervise(宇信通监管)
- * File: SysOrganizationFeignFallback.java
- * Class: com.supervise.api.sysorganization.SysOrganizationFeignFallback
- * Description: 组织机构表.
+ * Project: supervise(宇信通监管)
+ * File: PszxpfsjFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjFeignFallback
+ * Description: 采购订单商品信息.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
+ * Makedate: 2022-12-24 14:12:54
* - * @author dongjianzhao + * @author liupopo * @version 1.0 * @since 1.0 */ @Component -public class SysOrganizationFeignFallback implements SysOrganizationFeign { +public class PszxpfsjFeignFallback implements PszxpfsjFeign { @Override - public ResultBean> listPage(PagerQuery pq){ + public ResultBean> listPage(PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/sysorganization/listPage无法访问"); + return rb.setMsg("接口supervise/pszxpfsj/listPage无法访问"); } @Override - public ResultBean save(SysOrganizationDto dto){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/sysorganization/save无法访问"); + public ResultBean save(PszxpfsjDto dto){ + return ResultBean.fireFail().setMsg("接口supervise/pszxpfsj/save无法访问"); } @Override public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/sysorganization/delBySids无法访问"); + return ResultBean.fireFail().setMsg("接口supervise/pszxpfsj/delBySids无法访问"); } @Override - public ResultBean fetchDetailsBySid(String sid){ + public ResultBean fetchDetailsBySid(String sid){ ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/sysorganization/fetchDetailsBySid无法访问"); + return rb.setMsg("接口supervise/pszxpfsj/fetchDetailsBySid无法访问"); } } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjQuery.java new file mode 100644 index 00000000..47c9b15c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjQuery.java @@ -0,0 +1,93 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.pszxpfsj; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(宇信通监管)
+ * File: PszxpfsjQuery.java
+ * Class: com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjQuery
+ * Description: 采购订单商品信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 查询条件", description = "采购订单商品信息 查询条件") +public class PszxpfsjQuery implements Query { + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("类型") + private String type; // 类型 + @ApiModelProperty("销售订单编号") + private String code; // 销售订单编号 + @ApiModelProperty("商品编码") + private String prodCode; // 商品编码 + @ApiModelProperty("商品条码") + private String prodBarCode; // 商品条码 + @ApiModelProperty("商品名称") + private String prodName; // 商品名称 + @ApiModelProperty("品牌代码") + private String brandCode; // 品牌代码 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("大类") + private String dalei; // 大类 + @ApiModelProperty("中类") + private String zhonglei; // 中类 + @ApiModelProperty("小类") + private String xiaolei; // 小类 + @ApiModelProperty("客户代码") + private String cutomerCode; // 客户代码 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("销售数量") + private String salesNum; // 销售数量 + @ApiModelProperty("销售渠道") + private String storeCode; // 销售渠道 + @ApiModelProperty("销售价格") + private String unitPrice; // 销售价格 + @ApiModelProperty("销售成本") + private String salesPrice; // 销售成本 + @ApiModelProperty("利润") + private String lirun; // 利润 + @ApiModelProperty("数据日期") + private String orderDate; // 数据日期 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjVo.java new file mode 100644 index 00000000..e661eb9c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/pszxpfsj/PszxpfsjVo.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.pszxpfsj; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(宇信通监管)
+ * File: PszxpfsjVo.java
+ * Class: com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjVo
+ * Description: 采购订单商品信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "采购订单商品信息 视图数据对象", description = "采购订单商品信息 视图数据对象") +public class PszxpfsjVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("创建者") + private String createSid; // 创建者 + @ApiModelProperty("更新者") + private String modifySid; // 更新者 + @ApiModelProperty("类型") + private String type; // 类型 + @ApiModelProperty("销售订单编号") + private String code; // 销售订单编号 + @ApiModelProperty("商品编码") + private String prodCode; // 商品编码 + @ApiModelProperty("商品条码") + private String prodBarCode; // 商品条码 + @ApiModelProperty("商品名称") + private String prodName; // 商品名称 + @ApiModelProperty("品牌代码") + private String brandCode; // 品牌代码 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("大类") + private String dalei; // 大类 + @ApiModelProperty("中类") + private String zhonglei; // 中类 + @ApiModelProperty("小类") + private String xiaolei; // 小类 + @ApiModelProperty("客户代码") + private String cutomerCode; // 客户代码 + @ApiModelProperty("客户名称") + private String customerName; // 客户名称 + @ApiModelProperty("销售数量") + private String salesNum; // 销售数量 + @ApiModelProperty("销售渠道") + private String storeCode; // 销售渠道 + @ApiModelProperty("销售价格") + private String unitPrice; // 销售价格 + @ApiModelProperty("销售成本") + private String salesPrice; // 销售成本 + @ApiModelProperty("利润") + private String lirun; // 利润 + @ApiModelProperty("数据日期") + private String orderDate; // 数据日期 + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java index 3e5e786f..20e8e5fa 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisition.java @@ -88,4 +88,8 @@ public class PurchaseRequisition extends BaseEntity { private String newCode;// @ApiModelProperty("旧订单编号") private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java index 54ff8461..12ca344d 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDetailsVo.java @@ -93,6 +93,10 @@ public class PurchaseRequisitionDetailsVo implements Vo { private String newCode;// @ApiModelProperty("旧订单编号") private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 @ApiModelProperty("商品列表") private List pros=new ArrayList<>(); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java index 0c0131fa..65380af4 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionDto.java @@ -93,6 +93,10 @@ public class PurchaseRequisitionDto implements Dto { private String newCode;// @ApiModelProperty("旧订单编号") private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 @ApiModelProperty("商品列表") private List pros=new ArrayList<>(); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java index 95952450..5acb1f88 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeign.java @@ -69,7 +69,7 @@ public interface PurchaseRequisitionFeign { @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody - public ResultBean delBySids(@RequestParam("sids") String sids); + public ResultBean delBySids(@RequestBody String[] sids); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java index d3ea172f..5f07de31 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionFeignFallback.java @@ -60,7 +60,7 @@ public class PurchaseRequisitionFeignFallback implements PurchaseRequisitionFeig } @Override - public ResultBean delBySids( String sids){ + public ResultBean delBySids( String[] sids){ return ResultBean.fireFail().setMsg("接口宇信通监管/purchaserequisition/delBySids无法访问"); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java index 5bccc8a8..69cbe8f6 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionQuery.java @@ -56,10 +56,14 @@ public class PurchaseRequisitionQuery implements Query { private String buyerName; // 采购员姓名 @ApiModelProperty("采购员编码") private String buyerCode; // 采购员编码 - @ApiModelProperty("采购日期") - private String purchaseDate; // 采购日期 - @ApiModelProperty("到货日期") - private String arrivalDate; // 到货日期 + @ApiModelProperty("采购日期开始") + private String purchaseDateStart; // 采购日期 + @ApiModelProperty("采购日期结束") + private String purchaseDateEnd; // 采购日期 + @ApiModelProperty("到货日期开始") + private String arrivalDateStart; // 到货日期 + @ApiModelProperty("到货日期结束") + private String arrivalDateEnd; // 到货日期 @ApiModelProperty("采购组织名称") private String purchasingOrgName; // 采购组织名称 @ApiModelProperty("采购组织编码") @@ -86,4 +90,8 @@ public class PurchaseRequisitionQuery implements Query { private String newCode;// @ApiModelProperty("旧订单编号") private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java index ea41d01a..c2a7ca46 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/purchaserequisition/PurchaseRequisitionVo.java @@ -88,4 +88,10 @@ public class PurchaseRequisitionVo implements Vo { private String newCode;// @ApiModelProperty("旧订单编号") private String oldCode;// + @ApiModelProperty("完成状态") + private String completionStatus;//完成状态 + @ApiModelProperty("完成状态") + private String completionStatusKey;//完成状态 + @ApiModelProperty("订单金额") + private String packageTotalPrice; } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfo.java index 1cec211b..8ce227af 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfo.java @@ -27,6 +27,7 @@ package com.yxt.supervise.portal.api.supplierbankinfo; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -50,10 +51,6 @@ import lombok.Data; public class SupplierBankInfo extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 @ApiModelProperty("名称") private String name; // 名称 @ApiModelProperty("统一编码") @@ -82,5 +79,8 @@ public class SupplierBankInfo extends BaseEntity { private Integer bankState; // 银行0未审核，1审核通过，2审核不通过 @ApiModelProperty("银行审批意见") private String bankRemarks; // 银行审批意见 - + /* @ApiModelProperty("营业执照附件") + private String businessLicenseFiles; // 营业执照附件*/ + /* @ApiModelProperty("合同信息") + private SupplierContractInfoDto supplierContractInfoDto; // 合同信息*/ } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDetailsVo.java index 3b45e465..274d03b4 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDetailsVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDetailsVo.java @@ -28,6 +28,7 @@ package com.yxt.supervise.portal.api.supplierbankinfo; import com.yxt.common.core.vo.Vo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -51,10 +52,6 @@ public class SupplierBankInfoDetailsVo implements Vo { private String sid; // sid - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 @ApiModelProperty("名称") private String name; // 名称 @ApiModelProperty("统一编码") @@ -83,5 +80,10 @@ public class SupplierBankInfoDetailsVo implements Vo { private Integer bankState; // 银行0未审核，1审核通过，2审核不通过 @ApiModelProperty("银行审批意见") private String bankRemarks; // 银行审批意见 - + @ApiModelProperty("营业执照附件") + private String[] businessLicenseFiles; // 营业执照附件 + @ApiModelProperty("合同照片") + private String[] contractFiles; // 合同照片 + @ApiModelProperty("合同信息") + private SupplierContractInfoDto supplierContractInfoDto; // 合同信息 } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDto.java index 4286c174..f3b2404a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoDto.java @@ -28,6 +28,7 @@ package com.yxt.supervise.portal.api.supplierbankinfo; import com.yxt.common.core.dto.Dto; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -51,10 +52,6 @@ public class SupplierBankInfoDto implements Dto { private String sid; // sid - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 @ApiModelProperty("名称") private String name; // 名称 @ApiModelProperty("统一编码") @@ -83,5 +80,10 @@ public class SupplierBankInfoDto implements Dto { private Integer bankState; // 银行0未审核，1审核通过，2审核不通过 @ApiModelProperty("银行审批意见") private String bankRemarks; // 银行审批意见 - + @ApiModelProperty("营业执照附件") + private String[] businessLicenseFiles; // 营业执照附件 + @ApiModelProperty("合同照片") + private String[] contractFiles; // 合同照片 + @ApiModelProperty("合同信息") + private SupplierContractInfoDto supplierContractInfoDto; // 合同信息 } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeign.java index 025a4007..1a27c090 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeign.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeign.java @@ -69,7 +69,7 @@ public interface SupplierBankInfoFeign { @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") @ResponseBody - public ResultBean delBySids(@RequestBody String[] sids); + public ResultBean delBySids(@RequestBody String[] sids); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeignFallback.java index 8c6951f8..59a41565 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeignFallback.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoFeignFallback.java @@ -29,6 +29,7 @@ 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 org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -60,7 +61,7 @@ public class SupplierBankInfoFeignFallback implements SupplierBankInfoFeign { } @Override - public ResultBean delBySids( String[] sids){ + public ResultBean delBySids( String[]sids){ return ResultBean.fireFail().setMsg("接口supervise/supplierbankinfo/delBySids无法访问"); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoQuery.java index ad05d981..b4c20e4f 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoQuery.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoQuery.java @@ -49,10 +49,6 @@ import lombok.Data; @ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件") public class SupplierBankInfoQuery implements Query { - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 @ApiModelProperty("名称") private String name; // 名称 @ApiModelProperty("统一编码") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoVo.java index 5d3fe317..8a6ecf29 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoVo.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierbankinfo/SupplierBankInfoVo.java @@ -51,10 +51,6 @@ public class SupplierBankInfoVo implements Vo { private String sid; // sid - @ApiModelProperty("创建者") - private String createSid; // 创建者 - @ApiModelProperty("更新者") - private String modifySid; // 更新者 @ApiModelProperty("名称") private String name; // 名称 @ApiModelProperty("统一编码") diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfo.java new file mode 100644 index 00000000..3a2a387d --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfo.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.suppliercontractinfo; + +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: supervise(监管)
+ * File: SupplierContractInfo.java
+ * Class: com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfo
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息", description = "供应商信息") +@TableName("supplier_contract_info") +public class SupplierContractInfo extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("合同有效期") + private String contractValidity; // 合同有效期 + @ApiModelProperty("签署部门") + private String signingDepartment; // 签署部门 + @ApiModelProperty("签署人") + private String signatory; // 签署人 + @ApiModelProperty("经办人") + private String handledBy; // 经办人 + @ApiModelProperty("签署组织") + private String signingOrganization; // 签署组织 + @ApiModelProperty("合同金额") + private String contractPrice; // 合同金额 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDetailsVo.java new file mode 100644 index 00000000..42f0cb58 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDetailsVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.suppliercontractinfo; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoVo.java
+ * Class: com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情") +public class SupplierContractInfoDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("合同有效期") + private String contractValidity; // 合同有效期 + @ApiModelProperty("签署部门") + private String signingDepartment; // 签署部门 + @ApiModelProperty("签署人") + private String signatory; // 签署人 + @ApiModelProperty("经办人") + private String handledBy; // 经办人 + @ApiModelProperty("签署组织") + private String signingOrganization; // 签署组织 + @ApiModelProperty("合同金额") + private String contractPrice; // 合同金额 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDto.java new file mode 100644 index 00000000..3e42b6d6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoDto.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.suppliercontractinfo; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoDto.java
+ * Class: com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto
+ * Description: 供应商信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象") +public class SupplierContractInfoDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("合同有效期") + private String contractValidity; // 合同有效期 + @ApiModelProperty("签署部门") + private String signingDepartment; // 签署部门 + @ApiModelProperty("签署人") + private String signatory; // 签署人 + @ApiModelProperty("经办人") + private String handledBy; // 经办人 + @ApiModelProperty("签署组织") + private String signingOrganization; // 签署组织 + @ApiModelProperty("合同金额") + private String contractPrice; // 合同金额 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeign.java new file mode 100644 index 00000000..2185b931 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.suppliercontractinfo; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoFeign.java
+ * Class: com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoFeign
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商信息") +@FeignClient( + contextId = "supervise-SupplierContractInfo", + name = "supervise", + path = "v1/suppliercontractinfo", + fallback = SupplierContractInfoFeignFallback.class) +public interface SupplierContractInfoFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody SupplierContractInfoDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeignFallback.java new file mode 100644 index 00000000..70e9f3de --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.suppliercontractinfo; + +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; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoFeignFallback
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierContractInfoFeignFallback implements SupplierContractInfoFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口supervise/suppliercontractinfo/listPage无法访问"); + } + + @Override + public ResultBean save(SupplierContractInfoDto dto){ + return ResultBean.fireFail().setMsg("接口supervise/suppliercontractinfo/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口supervise/suppliercontractinfo/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口supervise/suppliercontractinfo/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoQuery.java new file mode 100644 index 00000000..1699fed9 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoQuery.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.suppliercontractinfo; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoQuery.java
+ * Class: com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoQuery
+ * Description: 供应商信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件") +public class SupplierContractInfoQuery implements Query { + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("合同有效期") + private String contractValidity; // 合同有效期 + @ApiModelProperty("签署部门") + private String signingDepartment; // 签署部门 + @ApiModelProperty("签署人") + private String signatory; // 签署人 + @ApiModelProperty("合同金额") + private String contractPrice; // 合同金额 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoVo.java new file mode 100644 index 00000000..c3161560 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/suppliercontractinfo/SupplierContractInfoVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.suppliercontractinfo; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoVo.java
+ * Class: com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:48
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") +public class SupplierContractInfoVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("合同编号") + private String contractNo; // 合同编号 + @ApiModelProperty("合同有效期") + private String contractValidity; // 合同有效期 + @ApiModelProperty("签署部门") + private String signingDepartment; // 签署部门 + @ApiModelProperty("签署人") + private String signatory; // 签署人 + @ApiModelProperty("经办人") + private String handledBy; // 经办人 + @ApiModelProperty("签署组织") + private String signingOrganization; // 签署组织 + @ApiModelProperty("合同金额") + private String contractPrice; // 合同金额 + @ApiModelProperty("供应商sid") + private String supplierSid; // 供应商sid + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndex.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndex.java new file mode 100644 index 00000000..62e148e0 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndex.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.supplierindex; + +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: supervise(宇信通监管)
+ * File: SupplierIndex.java
+ * Class: com.yxt.supervise.portal.api.supplierindex.SupplierIndex
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供货商编码对应表", description = "供货商编码对应表") +@TableName("supplier_index") +public class SupplierIndex { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("编码") + private String code; // 编码 + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一的编码") + private String codeUnified; // 统一的编码 + @ApiModelProperty("统一的名称") + private String nameUnified; // 统一的名称 + @ApiModelProperty("父类Sid") + private String PSid; // 父类Sid + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDetailsVo.java new file mode 100644 index 00000000..b52c63cc --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDetailsVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.supplierindex; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexVo.java
+ * Class: com.yxt.supervise.portal.api.supplierindex.SupplierIndexVo
+ * Description: 供货商编码对应表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供货商编码对应表 视图数据详情", description = "供货商编码对应表 视图数据详情") +public class SupplierIndexDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("编码") + private String code; // 编码 + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一的编码") + private String codeUnified; // 统一的编码 + @ApiModelProperty("统一的名称") + private String nameUnified; // 统一的名称 + @ApiModelProperty("父类Sid") + private String PSid; // 父类Sid + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDto.java new file mode 100644 index 00000000..2f24949b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexDto.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.supplierindex; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexDto.java
+ * Class: com.yxt.supervise.portal.api.supplierindex.SupplierIndexDto
+ * Description: 供货商编码对应表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供货商编码对应表 数据传输对象", description = "供货商编码对应表 数据传输对象") +public class SupplierIndexDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("编码") + private String code; // 编码 + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一的编码") + private String codeUnified; // 统一的编码 + @ApiModelProperty("统一的名称") + private String nameUnified; // 统一的名称 + @ApiModelProperty("父类Sid") + private String PSid; // 父类Sid + @ApiModelProperty("supplierIndexDto") + private List list; // 父类Sid +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeign.java new file mode 100644 index 00000000..1f87d3a3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeign.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.supplierindex; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexFeign.java
+ * Class: com.yxt.supervise.portal.api.supplierindex.SupplierIndexFeign
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供货商编码对应表") +@FeignClient( + contextId = "supervise-SupplierIndex", + name = "supervise", + path = "v1/supplierindex", + fallback = SupplierIndexFeignFallback.class) +public interface SupplierIndexFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody SupplierIndexDto dto); + @ApiOperation("保存关联供应商信息-验证") + @PostMapping("/verification") + @ResponseBody + public ResultBean verification(@RequestBody SupplierIndexDto dto); + @ApiOperation("保存关联供应商信息-新增保存") + @PostMapping("/verificationSave") + @ResponseBody + public ResultBean verificationSave(@RequestBody SupplierIndexDto dto); + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeignFallback.java new file mode 100644 index 00000000..662a3c07 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexFeignFallback.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.supplierindex; + +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; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexFeignFallback.java
+ * Class: com.yxt.supervise.portal.api.supplierindex.SupplierIndexFeignFallback
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierIndexFeignFallback implements SupplierIndexFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口supervise/supplierindex/listPage无法访问"); + } + + @Override + public ResultBean save(SupplierIndexDto dto){ + return ResultBean.fireFail().setMsg("接口supervise/supplierindex/save无法访问"); + } + + @Override + public ResultBean verification(SupplierIndexDto dto) { + return null; + } + + @Override + public ResultBean verificationSave(SupplierIndexDto dto) { + return null; + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口supervise/supplierindex/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口supervise/supplierindex/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexQuery.java new file mode 100644 index 00000000..a39b80f6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.supplierindex; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexQuery.java
+ * Class: com.yxt.supervise.portal.api.supplierindex.SupplierIndexQuery
+ * Description: 供货商编码对应表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供货商编码对应表 查询条件", description = "供货商编码对应表 查询条件") +public class SupplierIndexQuery implements Query { + + @ApiModelProperty("编码") + private String code; // 编码 + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一的编码") + private String codeUnified; // 统一的编码 + @ApiModelProperty("统一的名称") + private String nameUnified; // 统一的名称 + @ApiModelProperty("父类Sid") + private String PSid; // 父类Sid + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexVo.java new file mode 100644 index 00000000..370d0d9e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierindex/SupplierIndexVo.java @@ -0,0 +1,65 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.api.supplierindex; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexVo.java
+ * Class: com.yxt.supervise.portal.api.supplierindex.SupplierIndexVo
+ * Description: 供货商编码对应表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供货商编码对应表 视图数据对象", description = "供货商编码对应表 视图数据对象") +public class SupplierIndexVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("编码") + private String code; // 编码 + @ApiModelProperty("名称") + private String name; // 名称 + @ApiModelProperty("统一的编码") + private String codeUnified; // 统一的编码 + @ApiModelProperty("统一的名称") + private String nameUnified; // 统一的名称 + @ApiModelProperty("父类Sid") + private String PSid; // 父类Sid + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoDto.java index c8bcf82c..a9f68bc8 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoDto.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/supplierinfo/SupplierInfoDto.java @@ -53,33 +53,43 @@ public class SupplierInfoDto implements Dto { private String sid; // sid - @ApiModelProperty("记录版本，锁") - private String lock_version; // 记录版本，锁 - @ApiModelProperty("创建者") - private String create_sid; // 创建者 - @ApiModelProperty("更新者") - private String modify_sid; // 更新者 - @ApiModelProperty("记录是否可用，1:可用，0:不可用") - private String is_enable; // 记录是否可用，1:可用，0:不可用 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("记录创建时间") - private Date create_timeStart; // 记录创建时间 - private Date create_timeEnd; // 记录创建时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("记录最后修改时间") - private Date modify_timeStart; // 记录最后修改时间 - private Date modify_timeEnd; // 记录最后修改时间 - @ApiModelProperty("记录是否被删除，0:未删除，1:已经删除") - private String is_delete; // 记录是否被删除，0:未删除，1:已经删除 @ApiModelProperty("代码") private String code; // 代码 @ApiModelProperty("名称") private String name; // 名称 + @ApiModelProperty("联系人") + private String contacts; // 联系人 + @ApiModelProperty("电话") + private String telephone; // 电话 @ApiModelProperty("地址") private String address; // 地址 - @ApiModelProperty("电话") - private String telephone; // 电话 - @ApiModelProperty("联系人") - private String contacts; // 联系人 + @ApiModelProperty("法人") + private String legalRepresentative; // 法人 + @ApiModelProperty("银行账户") + private String bankAccount; // 银行账户 + @ApiModelProperty("银行账号") + private String bankAccountNumber; // 银行账号 + @ApiModelProperty("开户行") + private String bankName; // 开户行 + @ApiModelProperty("营业执照号码") + private String businessLicenseNo; // 营业执照号码 + @ApiModelProperty("营业执照附件") + private String businessLicenseFiles; // 电话 + @ApiModelProperty("合同照片") + private String contractFiles; // 合同照片 + @ApiModelProperty("合同编号") + private String contractNo; // 电话 + @ApiModelProperty("合同有效期") + private String contractValidity; // 合同有效期 + @ApiModelProperty("签署部门") + private String signingDepartment; // 签署部门 + @ApiModelProperty("签署人") + private String signatory; // 签署人 + @ApiModelProperty("合同金额") + private String contractPrice; // 合同金额 + + + + } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDetailsVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDetailsVo.java deleted file mode 100644 index 68ab0b6b..00000000 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDetailsVo.java +++ /dev/null @@ -1,83 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.portal.api.sysorganization; - - -import com.yxt.common.core.vo.Vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: SysOrganizationVo.java
- * Class: com.supervise.api.sysorganization.SysOrganizationVo
- * Description: 组织机构表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "组织机构表 视图数据详情", description = "组织机构表 视图数据详情") -public class SysOrganizationDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("部门/组织名称") - private String name; // 部门/组织名称 - @ApiModelProperty("父(部门/组织) sid") - private String psid; // 父(部门/组织) sid - @ApiModelProperty("联系电话") - private String linkPhone; // 联系电话 - @ApiModelProperty("部门sid全路径") - private String orgSidPath; // 部门sid全路径 - @ApiModelProperty("排序") - private Integer sort; // 排序 - @ApiModelProperty("地址") - private String addrs; // 地址 - @ApiModelProperty("地理位置经纬度") - private String jwd; // 地理位置经纬度 - @ApiModelProperty("部门编码") - private String orgCode; // 部门编码 - @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") - private String orgShortName; // 部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母）） - @ApiModelProperty("联系人") - private String linkPerson; // 联系人 - @ApiModelProperty("是否是独立法人:0是，1否") - private Integer isDept; // 是否是独立法人:0是，1否 - @ApiModelProperty("是否是公司：0否，1是") - private Integer isOrg; // 是否是公司：0否，1是 - @ApiModelProperty("组织属性key") - private String orgAttributeKey; // 组织属性key - @ApiModelProperty("组织属性value") - private String orgAttributeValue; // 组织属性value - -} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDto.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDto.java deleted file mode 100644 index 65f9a07e..00000000 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationDto.java +++ /dev/null @@ -1,83 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.portal.api.sysorganization; - - -import com.yxt.common.core.dto.Dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: SysOrganizationDto.java
- * Class: com.supervise.api.sysorganization.SysOrganizationDto
- * Description: 组织机构表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "组织机构表 数据传输对象", description = "组织机构表 数据传输对象") -public class SysOrganizationDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("部门/组织名称") - private String name; // 部门/组织名称 - @ApiModelProperty("父(部门/组织) sid") - private String psid; // 父(部门/组织) sid - @ApiModelProperty("联系电话") - private String linkPhone; // 联系电话 - @ApiModelProperty("部门sid全路径") - private String orgSidPath; // 部门sid全路径 - @ApiModelProperty("排序") - private Integer sort; // 排序 - @ApiModelProperty("地址") - private String addrs; // 地址 - @ApiModelProperty("地理位置经纬度") - private String jwd; // 地理位置经纬度 - @ApiModelProperty("部门编码") - private String orgCode; // 部门编码 - @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") - private String orgShortName; // 部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母）） - @ApiModelProperty("联系人") - private String linkPerson; // 联系人 - @ApiModelProperty("是否是独立法人:0是，1否") - private Integer isDept; // 是否是独立法人:0是，1否 - @ApiModelProperty("是否是公司：0否，1是") - private Integer isOrg; // 是否是公司：0否，1是 - @ApiModelProperty("组织属性key") - private String orgAttributeKey; // 组织属性key - @ApiModelProperty("组织属性value") - private String orgAttributeValue; // 组织属性value - -} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationQuery.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationQuery.java deleted file mode 100644 index 2b8fee2b..00000000 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationQuery.java +++ /dev/null @@ -1,81 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.portal.api.sysorganization; - - -import com.yxt.common.core.query.Query; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: SysOrganizationQuery.java
- * Class: com.supervise.api.sysorganization.SysOrganizationQuery
- * Description: 组织机构表 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "组织机构表 查询条件", description = "组织机构表 查询条件") -public class SysOrganizationQuery implements Query { - - @ApiModelProperty("部门/组织名称") - private String name; // 部门/组织名称 - @ApiModelProperty("父(部门/组织) sid") - private String psid; // 父(部门/组织) sid - @ApiModelProperty("联系电话") - private String linkPhone; // 联系电话 - @ApiModelProperty("部门sid全路径") - private String orgSidPath; // 部门sid全路径 - @ApiModelProperty("排序") - private Integer sort; // 排序 - @ApiModelProperty("地址") - private String addrs; // 地址 - @ApiModelProperty("地理位置经纬度") - private String jwd; // 地理位置经纬度 - @ApiModelProperty("部门编码") - private String orgCode; // 部门编码 - @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") - private String orgShortName; // 部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母）） - @ApiModelProperty("联系人") - private String linkPerson; // 联系人 - @ApiModelProperty("是否是独立法人:0是，1否") - private Integer isDept; // 是否是独立法人:0是，1否 - @ApiModelProperty("是否是公司：0否，1是") - private Integer isOrg; // 是否是公司：0否，1是 - @ApiModelProperty("组织属性key") - private String orgAttributeKey; // 组织属性key - @ApiModelProperty("组织属性value") - private String orgAttributeValue; // 组织属性value - -} diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationVo.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationVo.java deleted file mode 100644 index 66c983ff..00000000 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/supervise/portal/api/sysorganization/SysOrganizationVo.java +++ /dev/null @@ -1,83 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.portal.api.sysorganization; - - -import com.yxt.common.core.vo.Vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: SysOrganizationVo.java
- * Class: com.supervise.api.sysorganization.SysOrganizationVo
- * Description: 组织机构表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象") -public class SysOrganizationVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("部门/组织名称") - private String name; // 部门/组织名称 - @ApiModelProperty("父(部门/组织) sid") - private String psid; // 父(部门/组织) sid - @ApiModelProperty("联系电话") - private String linkPhone; // 联系电话 - @ApiModelProperty("部门sid全路径") - private String orgSidPath; // 部门sid全路径 - @ApiModelProperty("排序") - private Integer sort; // 排序 - @ApiModelProperty("地址") - private String addrs; // 地址 - @ApiModelProperty("地理位置经纬度") - private String jwd; // 地理位置经纬度 - @ApiModelProperty("部门编码") - private String orgCode; // 部门编码 - @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））") - private String orgShortName; // 部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母）） - @ApiModelProperty("联系人") - private String linkPerson; // 联系人 - @ApiModelProperty("是否是独立法人:0是，1否") - private Integer isDept; // 是否是独立法人:0是，1否 - @ApiModelProperty("是否是公司：0否，1是") - private Integer isOrg; // 是否是公司：0否，1是 - @ApiModelProperty("组织属性key") - private String orgAttributeKey; // 组织属性key - @ApiModelProperty("组织属性value") - private String orgAttributeValue; // 组织属性value - -} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml index b790ea38..6073feb7 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/pom.xml @@ -46,10 +46,10 @@ 0.0.1-SNAPSHOT - - - - + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + mysql diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java index 152ab641..59a8a79c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/PortalApplication.java @@ -10,8 +10,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.common.base.config", "com.yxt.supervise.portal" }) -// @EnableDiscoveryClient -// @EnableFeignClients(basePackages = {"com.yxt.supervise.*"}) +@EnableDiscoveryClient +@EnableFeignClients(basePackages = {"com.yxt.supervise.*"}) public class PortalApplication { public static void main(String[] args) { SpringApplication.run(PortalApplication.class, args); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java index c095eba4..d93da00c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumRest.java @@ -156,7 +156,7 @@ public class ProductNumRest implements ProductNumFeign { ex.printStackTrace(); } } - @ApiOperation(" ") + /*@ApiOperation(" ") @RequestMapping(value = "/products", method = RequestMethod.GET) public ResultBean products(HttpServletRequest request, HttpServletResponse response){ String pc=request.getParameter("code"); @@ -175,5 +175,5 @@ public class ProductNumRest implements ProductNumFeign { e.printStackTrace(); } return rb; - } + }*/ } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java index 0f63ec5b..d758aaa1 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productnum/ProductNumService.java @@ -461,17 +461,17 @@ public class ProductNumService extends MybatisBaseService list) { Map map=new HashMap(); map.put("pc",pu.getCode()); @@ -591,5 +591,5 @@ public class ProductNumService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.pszxpfsj; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.portal.api.salesdata.SalesData; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.supervise.portal.api.pszxpfsj.Pszxpfsj; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjVo; + +import java.util.List; +import java.util.Map; + +/** + * Project: supervise(宇信通监管)
+ * File: PszxpfsjMapper.java
+ * Class: com.yxt.supervise.portal.biz.pszxpfsj.PszxpfsjMapper
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PszxpfsjMapper extends BaseMapper { + + //@Update("update pszxpfsj 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 pszxpfsj") + List selectListVo(); + void batchInsert(@Param("list") List l); + @Insert("insert into import_data_info (date,remarks) values('#{date}','#{remarks}')") + void insertIntoImportDataInfo(@Param("date") String date, @Param("remarks") String s); + @Select("SELECT brandcode,brandName,dalei,zhonglei,xiaolei FROM pszxpfsj " + + "GROUP BY brandcode,brandName,dalei,zhonglei,xiaolei ") + List selectForBrandAndCategory(String orderDate); + @Select("update pszxpfsj p ,store_info si set p.storeName=si.name where p.storeCode=si.code ") + void updateStoreName(@Param("dataDate")String dataDate); + @Select("delete from pszxpfsj_verification ") + void deleteSalesDataByDate(@Param("date")String date); + @Select("select * from pszxpfsj ") + List selectByDateAndstoreCode(@Param("dataDate") String dataDate, @Param("storeCode") String storeCode); + @Select("select * from pszxpfsj ") + List selectByDate(String pc); + @Select("select * from pszxpfsj ") + List selectAll(); + @Select("select * from pszxpfsj ") + List selectByStoreCode(String storeCode); + + void insertPszxpfsjVerification(@Param("list")List> listss); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjMapper.xml new file mode 100644 index 00000000..b6629487 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + insert into `pszxpfsj` (`sid`, `type`, `code`, `prodCode`, `prodBarCode`, `prodName`, `brandCode`, `brandName`, `dalei`, + `zhonglei`, `xiaolei`, `cutomerCode`, `customerName`, `salesNum`, + `storeCode`, `unitPrice`, `salesPrice`, `lirun`, `orderDate`) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.type,jdbcType=VARCHAR}, + #{item.code,jdbcType=VARCHAR}, + #{item.prodCode,jdbcType=VARCHAR}, + #{item.prodBarCode,jdbcType=VARCHAR}, + #{item.prodName,jdbcType=VARCHAR}, + #{item.brandCode,jdbcType=VARCHAR}, + #{item.brandName,jdbcType=VARCHAR}, + #{item.dalei,jdbcType=VARCHAR}, + #{item.zhonglei,jdbcType=VARCHAR}, + #{item.xiaolei,jdbcType=VARCHAR}, + #{item.cutomerCode,jdbcType=VARCHAR}, + #{item.customerName,jdbcType=VARCHAR}, + #{item.salesNum,jdbcType=VARCHAR}, + #{item.storeCode,jdbcType=VARCHAR}, + #{item.unitPrice,jdbcType=VARCHAR}, + #{item.salesPrice,jdbcType=VARCHAR}, + #{item.lirun,jdbcType=VARCHAR}, + #{item.orderDate,jdbcType=VARCHAR} + ) + + + + insert into `pszxpfsj_verification` (`sid`, `type`, `code`, `prodCode`, `prodBarCode`, `prodName`, `brandCode`, `brandName`, `dalei`, + `zhonglei`, `xiaolei`, `cutomerCode`, `customerName`, `salesNum`, + `storeCode`,`storeName`, `unitPrice`, `salesPrice`, `lirun`, `orderDate`) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.type,jdbcType=VARCHAR}, + #{item.code,jdbcType=VARCHAR}, + #{item.prodCode,jdbcType=VARCHAR}, + #{item.prodBarCode,jdbcType=VARCHAR}, + #{item.prodName,jdbcType=VARCHAR}, + #{item.brandCode,jdbcType=VARCHAR}, + #{item.brandName,jdbcType=VARCHAR}, + #{item.dalei,jdbcType=VARCHAR}, + #{item.zhonglei,jdbcType=VARCHAR}, + #{item.xiaolei,jdbcType=VARCHAR}, + #{item.cutomerCode,jdbcType=VARCHAR}, + #{item.customerName,jdbcType=VARCHAR}, + #{item.salesNum,jdbcType=VARCHAR}, + #{item.storeCode,jdbcType=VARCHAR}, + #{item.storeName,jdbcType=VARCHAR}, + #{item.unitPrice,jdbcType=VARCHAR}, + #{item.salesPrice,jdbcType=VARCHAR}, + #{item.lirun,jdbcType=VARCHAR}, + #{item.orderDate,jdbcType=VARCHAR} + ) + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjRest.java new file mode 100644 index 00000000..fd475be3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjRest.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.pszxpfsj; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.supervise.portal.api.pszxpfsj.Pszxpfsj; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjQuery; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjVo; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjDetailsVo; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjDto; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjFeign; +import org.springframework.web.multipart.MultipartFile; + +/** + * Project: supervise(宇信通监管)
+ * File: PszxpfsjFeignFallback.java
+ * Class: com.yxt.supervise.portal.biz.pszxpfsj.PszxpfsjRest
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单商品信息") +@RestController("com.yxt.supervise.portal.biz.pszxpfsj.PszxpfsjRest") +@RequestMapping("v1/pszxpfsj") +public class PszxpfsjRest implements PszxpfsjFeign { + + @Autowired + private PszxpfsjService pszxpfsjService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = pszxpfsjService.listPageVo(pq); + return rb.success().setData(pv); + } + @ApiOperation(" ") + @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) + public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file ){ + ResultBean rb = ResultBean.fireFail(); + pszxpfsjService.readBrandPeriodSorXls1(file); + return rb; + } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody PszxpfsjDto dto){ + ResultBean rb = ResultBean.fireFail(); + pszxpfsjService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + pszxpfsjService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + PszxpfsjDetailsVo vo = pszxpfsjService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjService.java new file mode 100644 index 00000000..b03c8312 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/pszxpfsj/PszxpfsjService.java @@ -0,0 +1,360 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.pszxpfsj; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.poi.excel.ExcelUtil; +import cn.hutool.poi.excel.sax.handler.RowHandler; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.FileUploadResult; +import com.yxt.supervise.portal.api.brandinfo.BrandInfo; +import com.yxt.supervise.portal.api.brandinfo.BrandInfoVo; +import com.yxt.supervise.portal.api.dictcommon.DictCommon; +import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo; +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; +import com.yxt.supervise.portal.api.salesdata.SalesData; +import com.yxt.supervise.portal.api.storeinfo.StoreInfo; +import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; +import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; +import com.yxt.supervise.portal.biz.gdinstorage.GdInstorageGd; +import com.yxt.supervise.portal.biz.purchaserequisitionpro.PurchaseRequisitionProService; +import com.yxt.supervise.portal.biz.storeinfo.StoreInfoService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +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 com.yxt.supervise.portal.api.pszxpfsj.Pszxpfsj; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjQuery; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjVo; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjDetailsVo; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjDto; +import com.yxt.supervise.portal.api.pszxpfsj.PszxpfsjFeign; + +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.CellStyle; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * Project: supervise(宇信通监管)
+ * File: PszxpfsjService.java
+ * Class: com.yxt.supervise.portal.biz.pszxpfsj.PszxpfsjService
+ * Description: 采购订单商品信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-24 14:12:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Slf4j +@Service +public class PszxpfsjService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; + @Resource + private DictCommonService dictCommonService; + @Resource + private BrandInfoService brandInfoService; + @Resource + private PurchaseRequisitionProService purchaseRequisitionProService; + @Resource + private StoreInfoService storeInfoService; + private QueryWrapper createQueryWrapper(PszxpfsjQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + PszxpfsjQuery 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 void saveOrUpdateDto(PszxpfsjDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(PszxpfsjDto dto){ + Pszxpfsj entity = new Pszxpfsj(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(PszxpfsjDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + Pszxpfsj entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public PszxpfsjDetailsVo fetchDetailsVoBySid(String sid){ + Pszxpfsj entity = fetchBySid(sid); + PszxpfsjDetailsVo vo = new PszxpfsjDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + public void readBrandPeriodSorXls1(MultipartFile file) { + + ResultBean fub = fileUploadComponent.uploadFile(file, "pszxpfsj"); + String filePath = fub.getData().getFilePath(); + String fp = fileUploadComponent.getUploadPath() + filePath; + long millis = System.currentTimeMillis(); + ExcelUtil.read07BySax(fp, -1, createRowHandler()); + + } + private RowHandler createRowHandler( ) { + return new RowHandler() { + + List lisss=new ArrayList<>(); + List salesDatas=new ArrayList<>(); + int i = 0; + int j = 0; + @Override + public void handle(int sheetIndex, long rowNum, List r) { + if(rowNum>=1){ + Map sd_map=new HashMap<>(); + + try{ + log.info("r:{}",JSONObject.toJSONString(r)); + sd_map.put("type",r.get(1));//类型 + sd_map.put("code",r.get(2));//销售订单号 + sd_map.put("prodCode",r.get( 3));//商品代码 + sd_map.put("prodBarCode",r.get( 4));//商品条码 + sd_map.put("prodName",r.get( 5));//商品名称 + sd_map.put("brandCode",r.get( 6));//品牌代码 + Object brandName=r.get(7); + if(brandName!=null) + sd_map.put("brandName",brandName.toString());//品牌名称 + + Object dalei=r.get(8);//大类 + if(dalei!=null) + sd_map.put("dalei",dalei.toString()); + + Object zhonglei=r.get(9);//中类 + if(zhonglei!=null) + sd_map.put("zhonglei",zhonglei); + + Object xiaolei=r.get(10);//小类 + if(xiaolei!=null) + sd_map.put("xiaolei",xiaolei); + + sd_map.put("cutomerCode",r.get( 11));//客户代码 + sd_map.put("customerName",r.get( 12));//客户名称 + sd_map.put("salesNum",r.get( 13));//销售数量 + sd_map.put("storeCode",r.get( 14));//销售渠道 + sd_map.put("unitPrice",r.get( 15));//销售价格 + sd_map.put("salesPrice",r.get( 16));//销售成本 + sd_map.put("lirun",r.get( 17));//利润 + sd_map.put("orderDate",r.get( 18));//销售日期 + Pszxpfsj sd=new Pszxpfsj(); + BeanUtil.fillBeanWithMap(sd_map, sd, true); + salesDatas.add(sd); + i++; + }catch(Exception e){ + e.printStackTrace(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + baseMapper.insertIntoImportDataInfo(sdf.format(new Date()),"配送中心导入第"+i+"出现异常"+e.getMessage()); + System.err.println("i="+i+",value=null"); + } + lisss.add(rowNum+""); + + //inventoryInformationService.reduceStock(sd.getProCode(),sd.getProName(),sd.getStoreCode(),sd.getSaleNum()); + log.info("Pszxpfsj:{}", JSONObject.toJSONString(sd_map)); + log.info("rowNum:{}", rowNum); + } + } + + @Override + public void handleCell(int sheetIndex, long rowIndex, int cellIndex, Object value, CellStyle xssfCellStyle) { + RowHandler.super.handleCell(sheetIndex, rowIndex, cellIndex, value, xssfCellStyle); + } + + @Override + public void doAfterAllAnalysed() { + List> listArray = new ArrayList>(); + int listSize = salesDatas.size(); + int pageSize=5000; + for (int i = 0; i < listSize; i += pageSize) { + int toIndex = Math.min(i + pageSize, listSize); + listArray.add(salesDatas.subList(i, toIndex)); + } + for(List l:listArray){ + log.info("batchInsert-start:{}",l.size()); + baseMapper.batchInsert(l); + log.info("batchInsert-end:{}",l.size()); + } + List list= baseMapper.selectForBrandAndCategory(salesDatas.get(0).getOrderDate()); + int i=0; + for(Pszxpfsj sd:list){ + if(sd==null||sd.getBrandCode()==null||sd.getDalei()==null){ + continue; + } + BrandInfoVo brandInfoVo = brandInfoService.selectByCode(sd.getBrandCode()); + if(brandInfoVo==null){ + BrandInfo brandInfo = new BrandInfo(); + brandInfo.setName(sd.getBrandName()); + brandInfo.setCode(sd.getBrandCode()); + //brandInfoService.insert(brandInfo); + } + String dalei=sd.getDalei(); + String[] split_dalei = dalei.split("]"); + String key_dalei = split_dalei[0].replace("[","");//key + i++; + log.info("sd:{}",JSONObject.toJSONString(sd)); + log.info("i:{}",i); + log.info("dalei:{}",dalei); + String v_dalei=split_dalei[1];//类别value + DictCommonDetailsVo category_dalei = dictCommonService.fetchByKeyAndType(key_dalei, "category"); + if(category_dalei==null){ + DictCommon dc=new DictCommon(); + dc.setDictType("category"); + dc.setDictKey(key_dalei); + dc.setDictValue(v_dalei); + dictCommonService.insert(dc); + } + String zhonglei=sd.getZhonglei(); + String[] split_zhonglei = zhonglei.split("]"); + String key_zhonglei = split_zhonglei[0].replace("[","");//key + String v_zhonglei=split_zhonglei[1];//类别value + DictCommonDetailsVo category_zhonglei = dictCommonService.fetchByKeyAndType(key_zhonglei, "category"); + if(category_zhonglei==null){ + DictCommon dc=new DictCommon(); + dc.setDictType("category"); + dc.setDictKey(key_zhonglei); + dc.setDictValue(v_zhonglei); + dictCommonService.insert(dc); + } + String xiaolei=sd.getXiaolei(); + String[] split_xiaolei = xiaolei.split("]"); + String key_xiaolei = split_xiaolei[0].replace("[","");//key + String v_xiaolei=split_xiaolei[1];//类别value + DictCommonDetailsVo category = dictCommonService.fetchByKeyAndType(key_xiaolei, "category"); + if(category==null){ + DictCommon dc=new DictCommon(); + dc.setDictType("category"); + dc.setDictKey(key_xiaolei); + dc.setDictValue(v_xiaolei); + dictCommonService.insert(dc); + } + } + baseMapper.updateStoreName(salesDatas.get(0).getOrderDate()); + baseMapper.deleteSalesDataByDate(salesDatas.get(0).getOrderDate()); + analysisSalesData(salesDatas.get(0).getOrderDate(),""); + RowHandler.super.doAfterAllAnalysed(); + } + }; + } + /** + * + * 分析销售数据 + * @param pc + * @return + */ + public HSSFWorkbook analysisSalesData(String pc, String storeCode){ + List list=new ArrayList<>(); + if(com.yxt.common.base.utils.StringUtils.isNotBlank(pc)&&com.yxt.common.base.utils.StringUtils.isNotBlank(storeCode)){ + list=baseMapper.selectByDateAndstoreCode(pc,storeCode); + }else if(com.yxt.common.base.utils.StringUtils.isNotBlank(pc)&&com.yxt.common.base.utils.StringUtils.isBlank(storeCode)){ + list=baseMapper.selectByDate(pc); + }else if(com.yxt.common.base.utils.StringUtils.isBlank(pc)&&com.yxt.common.base.utils.StringUtils.isBlank(storeCode)){ + list=baseMapper.selectAll(); + }else if(com.yxt.common.base.utils.StringUtils.isBlank(pc)&&com.yxt.common.base.utils.StringUtils.isNotBlank(storeCode)){ + list=baseMapper.selectByStoreCode(storeCode); + } + //创建HSSFWorkbook + //addProductNum(list); + List> listss=new ArrayList<>(); + int i=0; + for(Pszxpfsj s:list){ + String proCode = s.getProdCode(); + //List storeInfos=storeInfoService.selectLimitStores(); + List lps=purchaseRequisitionProService.selectByCode(proCode); + if((lps==null||lps.size()==0)){//&&s.getCategorys().indexOf("0811")<0 烟 + continue; + } + StoreInfo storeInfo = storeInfoService.selectByCode(s.getStoreCode()); + /*if(storeInfo!=null){*/ + Map map=new HashMap<>(); + map.put("sid",UUID.randomUUID().toString()); + map.put("storeCode","["+s.getStoreCode()+"]"+storeInfo.getName()); + map.put("storeName",storeInfo.getName()); + map.put("brandCode",s.getBrandCode()); + map.put("brandName",s.getBrandName()); + map.put("type",s.getType()); + map.put("code",s.getCode()); + map.put("prodCode",s.getProdCode()); + map.put("prodBarCode",s.getProdBarCode()); + map.put("prodName",s.getProdName()); + map.put("cutomerCode",s.getCutomerCode()); + map.put("customerName",s.getCustomerName()); + map.put("salesNum",s.getSalesNum()); + map.put("unitPrice",s.getUnitPrice()); + map.put("salesPrice",s.getSalesPrice()); + map.put("lirun",s.getLirun()); + map.put("orderDate",s.getOrderDate()); + map.put("dalei",s.getDalei()); + map.put("zhonglei",s.getZhonglei()); + map.put("xiaolei",s.getXiaolei()); + listss.add(map); + log.info("i:{}",i++); + //} else { + log.info("SalesData:{}",JSONObject.toJSONString(s)); + // } + } + log.info("开始insertPszxpfsjVerification"); + baseMapper.insertPszxpfsjVerification(listss); + log.info("结束insertPszxpfsjVerification"); + //double d=gdInstorageGdService.jmdRkmxdValOfDay(pc); + return null; + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java index 031db6bf..c0d28311 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.supervise.portal.api.productinformation.ProductInformation; +import com.yxt.supervise.portal.api.productnum.ProductNum; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionDetailsVo; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionVo; @@ -57,4 +58,6 @@ public interface PurchaseRequisitionMapper extends BaseMapper selectByPc(@Param("pc")String pc); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml index a47d53a1..c80b886c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.xml @@ -41,6 +41,6 @@ \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java index 5c27c905..bb6b2a10 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionRest.java @@ -1,6 +1,7 @@ package com.yxt.supervise.portal.biz.purchaserequisition; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.io.resource.ResourceUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -15,6 +16,7 @@ import com.yxt.supervise.portal.biz.purchaserequisitionpro.PurchaseRequisitionPr import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -22,9 +24,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; +import java.net.URL; +import java.net.URLEncoder; import java.text.ParseException; import java.util.HashMap; import java.util.List; @@ -63,8 +65,11 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { } catch (IOException e) { e.printStackTrace(); } - purchaseRequisitionService.readBrandPeriodSorXls1(in,""); - return rb; + String code = purchaseRequisitionService.readBrandPeriodSorXls1(in, ""); + PurchaseRequisition purchaseRequisition = purchaseRequisitionService.selectByCode(code); + String sid = purchaseRequisition.getSid(); + ResultBean objectResultBean = fetchDetailsBySid(sid); + return rb.success().setData(objectResultBean.getData()); } @ApiOperation(" ") @RequestMapping(value = "/supplierAnalysis", method = RequestMethod.POST) @@ -115,8 +120,10 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { } @Override - public ResultBean delBySids(String sids) { - return purchaseRequisitionService.delBySids(sids); + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb=ResultBean.fireFail(); + int i = purchaseRequisitionService.delBySids(sids); + return rb.success().setData(i); } @Override @@ -127,4 +134,80 @@ public class PurchaseRequisitionRest implements PurchaseRequisitionFeign { vo.setPros(purchaseRequisitionPros); return resultBean.success().setData(vo); } + @ApiOperation(" ") + @RequestMapping(value = "/exportExcel", method = RequestMethod.GET) + public ResultBean exportExcel(HttpServletRequest request, HttpServletResponse response){ + String pc=request.getParameter("code"); + ResultBean rb = ResultBean.fireFail(); //excel标题 + //excel文件名 + String fileName = pc+"采购订单商品明细表"+System.currentTimeMillis()+".xls"; + HSSFWorkbook wb = purchaseRequisitionService.products( pc); + //响应到客户端 + try { + this.setResponseHeader(response, fileName); + OutputStream os = response.getOutputStream(); + wb.write(os); + os.flush(); + os.close(); + } catch (Exception e) { + e.printStackTrace(); + } + return rb; + } + public void setResponseHeader(HttpServletResponse response, String fileName) { + try { + try { + fileName = new String(fileName.getBytes(),"ISO8859-1"); + } catch (UnsupportedEncodingException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + response.setContentType("application/octet-stream;charset=ISO8859-1"); + response.setHeader("Content-Disposition", "attachment;filename="+ fileName); + response.addHeader("Pargam", "no-cache"); + response.addHeader("Cache-Control", "no-cache"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + @ApiOperation(" ") + @RequestMapping(value = "/yb", method = RequestMethod.GET) + public void yb(HttpServletRequest request, HttpServletResponse response){ + try { + URL resource = ResourceUtil.getResource("cgdd-tmpl/cgdd.xls"); +// path是指想要下载的文件的路径 + File file = new File(resource.getFile()); + log.info(file.getPath()); +// 获取文件名 + String filename = file.getName(); +// 获取文件后缀名 + String ext = filename.substring(filename.lastIndexOf(".") + 1).toLowerCase(); + log.info("文件后缀名：" + ext); + +// 将文件写入输入流 + FileInputStream fileInputStream = new FileInputStream(file); + InputStream fis = new BufferedInputStream(fileInputStream); + byte[] buffer = new byte[fis.available()]; + fis.read(buffer); + fis.close(); + +// 清空response + response.reset(); +// 设置response的Header + response.setCharacterEncoding("UTF-8"); +//Content-Disposition的作用：告知浏览器以何种方式显示响应返回的文件，用浏览器打开还是以附件的形式下载到本地保存 +//attachment表示以附件方式下载 inline表示在线打开 "Content-Disposition: inline; filename=文件名.mp3" +// filename表示文件的默认名称，因为网络传输只支持URL编码的相关支付，因此需要将文件名URL编码后进行传输,前端收到后需要反编码才能获取到真正的名称 + response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); +// 告知浏览器文件的大小 + response.addHeader("Content-Length", "" + file.length()); + OutputStream outputStream = new BufferedOutputStream(response.getOutputStream()); + response.setContentType("application/octet-stream"); + outputStream.write(buffer); + outputStream.flush(); + } catch (IOException ex) { + ex.printStackTrace(); + } + + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java index 972cb5d0..0247e6aa 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java @@ -1,6 +1,5 @@ package com.yxt.supervise.portal.biz.purchaserequisition; -import cn.hutool.Hutool; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -11,18 +10,16 @@ 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.supervise.portal.api.brandinfo.BrandInfo; -import com.yxt.supervise.portal.api.brandinfo.BrandInfoVo; import com.yxt.supervise.portal.api.dictcommon.DictCommon; import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo; -import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfo; -import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfoVo; import com.yxt.supervise.portal.api.productinformation.*; +import com.yxt.supervise.portal.api.productnum.ProductNum; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionDetailsVo; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionQuery; import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisitionVo; import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; +import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionProDto; import com.yxt.supervise.portal.api.restrictedcategory.RestrictedCategory; import com.yxt.supervise.portal.api.warehouseposition.WarehousePosition; import com.yxt.supervise.portal.api.warehouseposition.WarehousePositionVo; @@ -30,17 +27,17 @@ import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; import com.yxt.supervise.portal.biz.gdinventory.GdRescategoryProdService; import com.yxt.supervise.portal.biz.manufacturerinfo.ManufacturerInfoService; import com.yxt.supervise.portal.biz.productinformation.ProductInformationService; +import com.yxt.supervise.portal.biz.productnum.ProductNumService; import com.yxt.supervise.portal.biz.purchaserequisitionpro.PurchaseRequisitionProService; import com.yxt.supervise.portal.biz.restrictedcategory.RestrictedCategoryService; import com.yxt.supervise.portal.biz.supplierinfo.SupplierInfoService; import com.yxt.supervise.portal.biz.warehouseposition.WarehousePositionService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -70,10 +67,37 @@ public class PurchaseRequisitionService extends MybatisBaseService createQueryWrapper(PurchaseRequisitionQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); + + if (StringUtils.isNotBlank(query.getCode())) { + qw.like("code", query.getCode()); + } + if (StringUtils.isNotBlank(query.getBuyerName())) { + qw.like("buyerName", query.getBuyerName()); + } + if (StringUtils.isNotBlank(query.getSupplierName())) { + qw.like("supplierName", query.getSupplierName()); + } + if (StringUtils.isNotBlank(query.getPurchasingOrgName())) { + qw.like("purchasingOrgName", query.getPurchasingOrgName()); + } + if (StringUtils.isNotBlank(query.getCompletionStatusKey())) { + qw.eq("completionStatusKey", query.getCompletionStatusKey()); + } + String purchaseDateStart = query.getPurchaseDateStart(); + String purchaseDateEnd = query.getPurchaseDateEnd(); + qw.apply(StringUtils.isNotEmpty(purchaseDateStart), "date_format (purchaseDate,'%Y-%m-%d') >= date_format('" + purchaseDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(purchaseDateEnd), "date_format (purchaseDate,'%Y-%m-%d') <= date_format('" + purchaseDateEnd + "','%Y-%m-%d')" + ); + String arrivalDateStart = query.getArrivalDateStart(); + String arrivalDateEnd = query.getArrivalDateEnd(); + qw.apply(StringUtils.isNotEmpty(arrivalDateStart), "date_format (arrivalDate,'%Y-%m-%d') >= date_format('" + arrivalDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(arrivalDateEnd), "date_format (arrivalDate,'%Y-%m-%d') <= date_format('" + arrivalDateEnd + "','%Y-%m-%d')" + ); return qw; } @@ -148,7 +172,7 @@ public class PurchaseRequisitionService extends MybatisBaseService6){ ProductInformation p=new ProductInformation(); @@ -373,6 +405,9 @@ public class PurchaseRequisitionService extends MybatisBaseService list=purchaseRequisitionProService.selectByMainSid(purchaseRequisitionSid); + addProductNum(purchaseRequisition,list); + + List productNums=baseMapper.selectByPc(pc); + // 第一步，创建一个HSSFWorkbook，对应一个Excel文件 + HSSFWorkbook wb = new HSSFWorkbook(); + // 第二步，在workbook中添加一个sheet,对应Excel文件中的sheet + HSSFSheet sheet = wb.createSheet(sheetName); + // 合并单元格：参数：起始行, 终止行, 起始列, 终止列 + CellRangeAddress cra = new CellRangeAddress(0, 0, 0, 17); + sheet.addMergedRegion(cra); + // 第三步，在sheet中添加表头第0行,注意老版本poi对Excel的行数列数有限制 + + HSSFRow row = sheet.createRow(0); + // 第四步，创建单元格，并设置值表头 设置表头居中 + HSSFCellStyle style = wb.createCellStyle(); + style.setAlignment(HorizontalAlignment.CENTER); // 创建一个居中格式 + HSSFCell titleRow = row.createCell(0); + titleRow.setCellValue(title); + titleRow.setCellStyle(style); + + /*HSSFCell titleRow1 = row.createCell(1); + titleRow1.setCellValue("审核单号:123456789 状态:已通过审核 合计金额：12345678"); + titleRow1.setCellStyle(style);*/ + + //声明列对象 + + createRow3(sheet, 1, col1, style); + + //创建内容 + for(int i=0;i list) { + Map map=new HashMap(); + map.put("pc",pu.getCode()); + baseMapper.deleteByMap(map); + for(int i = 0; i < list.size(); i++){ + PurchaseRequisitionProDto p=list.get(i); + ProductNum pr=new ProductNum(); + pr.setPc(pu.getCode()); + pr.setSupplierCode(pu.getSupplierCode());//供应商代码 + pr.setSupplierName(pu.getSupplierName());//供应商名称 + ProductInformationVo productInformation=productInformationService.selectByCode(p.getProCode()); + ///ProductInformationVo b=productInformationService.limitJudgement(code); + ProductInformationVo b=productInformationService.selectByCode(p.getProCode()); + String brandSid = b.getBrandSid(); + String categoryKey = b.getCategoryKey(); + + List restrictedCategorys=restrictedCategoryService.limitJudgement(categoryKey,brandSid); + if("081101,081102,081103".indexOf(categoryKey)>=0||(restrictedCategorys!=null&&restrictedCategorys.size()>0)){ + pr.setState(1); + }else{ + pr.setState(0); + String remarks=""; + remarks=remarks+productInformation.getCategory()+"["+productInformation.getCategoryKey()+"]品类,"; + remarks=remarks+productInformation.getBrand()+"["+productInformation.getBrandSid()+"]品牌不符合;"; + pr.setRemarks(remarks); + } + pr.setCode(p.getProCode()); + if(productInformation!=null){ + pr.setBrand(productInformation.getBrand()); + pr.setCategory(productInformation.getCategory()); + } + pr.setBarCode(p.getSecondCode());//商品条码 + pr.setName(p.getProName());//商品名称 + pr.setUnit(p.getUnit());//单位 + String packageTotalPrice = p.getPackageTotalPrice(); + String number = p.getNumber(); + BigDecimal v = new BigDecimal(packageTotalPrice).divide(new BigDecimal(number),2,BigDecimal.ROUND_HALF_UP); + pr.setPurchasePrice(v.toString());//进价 送货金额/数量=进价 +// pr.setValence(productInformation.getRationingPrice());//配价 +// String retailAmount = p.getRetailAmount();//零售金额 + String packageSpec = p.getPackageInsideNumber();//包装规格 +// String packageNumber = p.getPackageNumber();//包装数量 +// BigDecimal v1 = new BigDecimal(retailAmount).divide(new BigDecimal(packageSpec),4,BigDecimal.ROUND_HALF_UP).divide(new BigDecimal(packageNumber),4,BigDecimal.ROUND_HALF_UP); + //double v1 = Double.parseDouble(retailAmount) / Double.parseDouble(packageSpec) / Double.parseDouble(packageNumber); +// pr.setPrice(v1.toString());//售价 零售金额/规格/包装数量=单价 + pr.setBoxGauge(packageSpec);//箱规 + pr.setNum(p.getNumber());//订货数量 + pr.setOrderAmount(p.getPackageTotalPrice());//订货金额 + pr.setTaxReceipt("");//税票 + pr.setDiscount("");//折扣 + + productNumService.insert(pr); + } + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java index 522a9031..7f6c94b4 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionpro/PurchaseRequisitionProMapper.java @@ -36,7 +36,7 @@ public interface PurchaseRequisitionProMapper extends BaseMapper> purchaseRequisitionPros); - @Select("select count(1) from gd_rescategory_prod where prodCode='#{proCode}'") + @Select("select count(1) from gd_rescategory_prod where prodCode=#{proCode}") int selectProdCodeTable(@Param("proCode") String proCode); @Insert("insert into gd_rescategory_prod(prodCode) values('#{proCode}')") int insertProdCodeTable(@Param("proCode")String proCode); diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java new file mode 100644 index 00000000..28bd3a3e --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.java @@ -0,0 +1,55 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitionstore; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreMapper.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitionstore.PurchaseRequisitionStoreMapper
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchaseRequisitionStoreMapper extends BaseMapper { + @Update("update purchase_requisition_store set detailPrice=#{detailPrice} where sid=#{sid}") + void updateDetailsPrice(@Param("sid") String sid, @Param("detailPrice") String price); + + //@Update("update purchase_requisition_store set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml new file mode 100644 index 00000000..df854cf8 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java new file mode 100644 index 00000000..2f5e7ced --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitionstore; + +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreQuery; +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreRest.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitionstore.PurchaseRequisitionStoreRest
+ * Description: 采购订单商品信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单商品信息") +@RestController("com.yxt.supervise.portal.biz.purchaserequisitionstore.PurchaseRequisitionStoreRest") +@RequestMapping("/purchaserequisitionstore") +public class PurchaseRequisitionStoreRest { + + @Autowired + private PurchaseRequisitionStoreService purchaseRequisitionStoreService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseRequisitionStoreService.listPage(pq); + return rb.success().setData(pv); + } + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = purchaseRequisitionStoreService.list(); + return rb.success().setData(list); + } + + @ApiOperation("保存新增或修改的数据") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchaseRequisitionStore entity) { + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionStoreService.saveOrUpdate(entity); + return rb.success(); + } + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids) { + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionStoreService.delByIds(ids); + return rb.success(); + } + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id) { + ResultBean rb = ResultBean.fireFail(); + PurchaseRequisitionStore entity = purchaseRequisitionStoreService.fetchById(id); + return rb.success().setData(entity); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java new file mode 100644 index 00000000..4bad8537 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitionstore; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStoreQuery; +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 org.apache.commons.lang3.StringUtils; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionStoreService.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitionstore.PurchaseRequisitionStoreService
+ * Description: 采购订单商品信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class PurchaseRequisitionStoreService extends MybatisBaseService { + + public PagerVo listPage(PagerQuery pq) { + PurchaseRequisitionStoreQuery 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; + } + + private QueryWrapper createQueryWrapper(PurchaseRequisitionStoreQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getCreateSid())) { + qw.eq("createSid", query.getCreateSid()); + } + + if (StringUtils.isNotBlank(query.getModifySid())) { + qw.eq("modifySid", query.getModifySid()); + } + + if (StringUtils.isNotBlank(query.getMainSid())) { + qw.eq("mainSid", query.getMainSid()); + } + + + + if (StringUtils.isNotBlank(query.getPrice())) { + qw.eq("price", query.getPrice()); + } + + + return qw; + } + + public void updateDetailsPrice(String sid, String price) { + baseMapper.updateDetailsPrice(sid,price); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java new file mode 100644 index 00000000..ab2c7b8b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitiontobacco; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; +import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco; +import com.yxt.supervise.portal.api.salesdata.SalesData; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoMapper.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitiontobacco.PurchaseRequisitionTobaccoMapper
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchaseRequisitionTobaccoMapper extends BaseMapper { + @Insert("insert into import_data_info (date,remarks) values('#{date}','#{remarks}')") + void insertIntoImportDataInfo(@Param("date") String date, @Param("remarks") String s); + + void batchInsert(List l); + + //@Update("update purchase_requisition_tobacco set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml new file mode 100644 index 00000000..0f90a3b4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.xml @@ -0,0 +1,25 @@ + + + + + + + insert into `purchase_requisition_store` ( `lockVersion`, `sid`, + `createSid`, `modifySid`, + `isEnable`, + `createTime`, + `modifyTime`, + `state`, `isDelete`, `mainSid`, `yczbh`, `storecode`, `storeName`, + `price`, `pc`) values + + ( '0',UUID(), + NULL,NULL, + '1', + #{item.createTime},#{item.modifyTime}, + #{item.state},'0',#{item.mainSid},#{item.yczbh}, + #{item.storeCode}, + #{item.storeName},#{item.price},#{item.pc} + ) + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java new file mode 100644 index 00000000..831d64c4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoRest.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitiontobacco; + +import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco; +import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoQuery; +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoRest.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitiontobacco.PurchaseRequisitionTobaccoRest
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单表") +@RestController("com.yxt.supervise.portal.biz.purchaserequisitiontobacco.PurchaseRequisitionTobaccoRest") +@RequestMapping("/purchaserequisitiontobacco") +public class PurchaseRequisitionTobaccoRest { + + @Autowired + private PurchaseRequisitionTobaccoService purchaseRequisitionTobaccoService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseRequisitionTobaccoService.listPage(pq); + return rb.success().setData(pv); + } + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = purchaseRequisitionTobaccoService.list(); + return rb.success().setData(list); + } + + @ApiOperation("保存新增或修改的数据") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchaseRequisitionTobacco entity) { + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionTobaccoService.saveOrUpdate(entity); + return rb.success(); + } + @ApiOperation(" ") + @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) + public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file ){ + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionTobaccoService.readBrandPeriodSorXls1(file); + return rb; + } + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids) { + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionTobaccoService.delByIds(ids); + return rb.success(); + } + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id) { + ResultBean rb = ResultBean.fireFail(); + PurchaseRequisitionTobacco entity = purchaseRequisitionTobaccoService.fetchById(id); + return rb.success().setData(entity); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java new file mode 100644 index 00000000..d13d7e0a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoService.java @@ -0,0 +1,311 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitiontobacco; + + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.poi.excel.ExcelUtil; +import cn.hutool.poi.excel.sax.handler.RowHandler; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; +import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco; +import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobaccoQuery; +import com.yxt.common.base.config.component.FileUploadComponent; +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.FileUploadResult; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import org.apache.poi.ss.usermodel.CellStyle; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoService.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitiontobacco.PurchaseRequisitionTobaccoService
+ * Description: 采购订单表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:54
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Slf4j +@Service +public class PurchaseRequisitionTobaccoService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; + public PagerVo listPage(PagerQuery pq) { + PurchaseRequisitionTobaccoQuery 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; + } + + private QueryWrapper createQueryWrapper(PurchaseRequisitionTobaccoQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getCreateSid())) { + qw.eq("createSid", query.getCreateSid()); + } + + if (StringUtils.isNotBlank(query.getModifySid())) { + qw.eq("modifySid", query.getModifySid()); + } + + if (StringUtils.isNotBlank(query.getCode())) { + qw.eq("code", query.getCode()); + } + + if (StringUtils.isNotBlank(query.getBuyerName())) { + qw.eq("buyerName", query.getBuyerName()); + } + + if (StringUtils.isNotBlank(query.getBuyerCode())) { + qw.eq("buyerCode", query.getBuyerCode()); + } + + if (StringUtils.isNotBlank(query.getPurchaseDate())) { + qw.eq("purchaseDate", query.getPurchaseDate()); + } + + if (StringUtils.isNotBlank(query.getArrivalDate())) { + qw.eq("arrivalDate", query.getArrivalDate()); + } + + if (StringUtils.isNotBlank(query.getPurchasingOrgName())) { + qw.eq("purchasingOrgName", query.getPurchasingOrgName()); + } + + if (StringUtils.isNotBlank(query.getPurchasingOrgCode())) { + qw.eq("purchasingOrgCode", query.getPurchasingOrgCode()); + } + + if (StringUtils.isNotBlank(query.getPurchasingDeptCode())) { + qw.eq("purchasingDeptCode", query.getPurchasingDeptCode()); + } + + if (StringUtils.isNotBlank(query.getPurchasingDeptName())) { + qw.eq("purchasingDeptName", query.getPurchasingDeptName()); + } + + if (StringUtils.isNotBlank(query.getSupplierName())) { + qw.eq("supplierName", query.getSupplierName()); + } + + if (StringUtils.isNotBlank(query.getSupplierCode())) { + qw.eq("supplierCode", query.getSupplierCode()); + } + + if (StringUtils.isNotBlank(query.getSupplierOnlyCode())) { + qw.eq("supplierOnlyCode", query.getSupplierOnlyCode()); + } + + if (StringUtils.isNotBlank(query.getLogisticsCompanyName())) { + qw.eq("logisticsCompanyName", query.getLogisticsCompanyName()); + } + + if (StringUtils.isNotBlank(query.getLogisticsCompanyCode())) { + qw.eq("logisticsCompanyCode", query.getLogisticsCompanyCode()); + } + + if (StringUtils.isNotBlank(query.getExpiryDate())) { + qw.eq("expiryDate", query.getExpiryDate()); + } + + if (StringUtils.isNotBlank(query.getWarehousePosition())) { + qw.eq("warehousePosition", query.getWarehousePosition()); + } + + if (StringUtils.isNotBlank(query.getWarehousePositionCode())) { + qw.eq("warehousePositionCode", query.getWarehousePositionCode()); + } + + if (StringUtils.isNotBlank(query.getPurchaseState())) { + qw.eq("purchaseState", query.getPurchaseState()); + } + + if (StringUtils.isNotBlank(query.getPurchaseRemarks())) { + qw.eq("purchaseRemarks", query.getPurchaseRemarks()); + } + + if (StringUtils.isNotBlank(query.getBankState())) { + qw.eq("bankState", query.getBankState()); + } + + if (StringUtils.isNotBlank(query.getBankRemarks())) { + qw.eq("bankRemarks", query.getBankRemarks()); + } + + if (StringUtils.isNotBlank(query.getCompletionStatus())) { + qw.eq("completionStatus", query.getCompletionStatus()); + } + + if (StringUtils.isNotBlank(query.getCompletionStatusKey())) { + qw.eq("completionStatusKey", query.getCompletionStatusKey()); + } + return qw; + } + public void readBrandPeriodSorXls1(MultipartFile file) { + + ResultBean fub = fileUploadComponent.uploadFile(file, "PurchaseRequisitionTobacco"); + String filePath = fub.getData().getFilePath(); + String fp = fileUploadComponent.getUploadPath() + filePath; + long millis = System.currentTimeMillis(); + ExcelUtil.read07BySax(fp, -1, createRowHandler()); + } + private RowHandler createRowHandler( ) { + return new RowHandler() { + + List lisss=new ArrayList<>(); + List salesDatas=new ArrayList<>(); + + String sid=UUID.randomUUID().toString(); + Map map=new HashMap<>(); + int i = 0; + int j = 0; + @Override + public void handle(int sheetIndex, long rowNum, List r) { + map.put("sid",sid); + if(rowNum==1){ + map.put("code",r.get(2)); + String tdrCode_s = r.get(4).toString(); + String[] split = tdrCode_s.split("\\["); + String s = split[1]; + String replace = s.replace("]", ""); + map.put("tdrCode",replace);//填单人 + map.put("tdrName",split[0]);//填单人 + map.put("purchaseDate",r.get(6));//填单时间 + map.put("supplierName",r.get(6));// + map.put("supplierCode",r.get(6));// + } + if(rowNum==2){ + String s = r.get(2).toString(); + String[] split = s.split("]"); + map.put("supplierName",split[1]);// + String s1 = split[0]; + String replace = s1.replace("[", ""); + map.put("supplierCode",replace);// + String o = r.get(4).toString(); + String[] split1 = o.split("]"); + map.put("warehousePosition",split1[1]); + String s2 = split1[0]; + String replace1 = s2.replace("[", ""); + map.put("warehousePositionCode",replace1); + map.put("arrivalDate",r.get(6)); + } + if(rowNum==3){ + String s = r.get(2).toString(); + String[] split = s.split("\\["); + map.put("buyerName",split[0]);// + String s1 = split[1]; + String replace = s1.replace("]", ""); + map.put("buyerCode",replace);// + String s3 = r.get(4).toString(); + String substring = s3.substring(s3.indexOf("[")+1, s3.indexOf("]")); + String substring1 = s3.substring(s3.indexOf("]")+1, s3.length()); + map.put("purchasingOrgName",substring); + map.put("purchasingOrgCode",substring1); + map.put("expiryDate", r.get(6).toString()); + } + if(rowNum==4){ + map.put("completionStatus", r.get(6).toString()); + map.put("completionStatus", "0"); + } + + if(rowNum>5){ + Map sd_map=new HashMap<>(); + try{ + sd_map.put("yczbh",r.get(2));//卷烟代码 + String o = r.get(3).toString(); + String[] split = o.split("]"); + String substring = split[0].substring(split[0].indexOf("[")+1, split[0].length()); + sd_map.put("storeCode",substring);//门店代码 + sd_map.put("storeName",split[1]);//门店名称 + sd_map.put("price",r.get( 4));//金额 + sd_map.put("pc",r.get( 5));//批次 + sd_map.put("mainSid",sid);//关联sid + PurchaseRequisitionStore sd=new PurchaseRequisitionStore(); + BeanUtil.fillBeanWithMap(sd_map, sd, true); + salesDatas.add(sd); + i++; + }catch(Exception e){ + e.printStackTrace(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + baseMapper.insertIntoImportDataInfo(sdf.format(new Date()),"烟草数据导入第"+i+"出现异常"+e.getMessage()); + System.err.println("i="+i+",value=null"); + } + lisss.add(rowNum+""); + log.info("productInformation:{}", JSONObject.toJSONString(sd_map)); + log.info("rowNum:{}", rowNum); + } + } + + @Override + public void handleCell(int sheetIndex, long rowIndex, int cellIndex, Object value, CellStyle xssfCellStyle) { + RowHandler.super.handleCell(sheetIndex, rowIndex, cellIndex, value, xssfCellStyle); + } + + @Override + public void doAfterAllAnalysed() { + List> listArray = new ArrayList>(); + int listSize = salesDatas.size(); + int pageSize=5000; + for (int i = 0; i < listSize; i += pageSize) { + int toIndex = Math.min(i + pageSize, listSize); + listArray.add(salesDatas.subList(i, toIndex)); + } + PurchaseRequisitionTobacco sd=new PurchaseRequisitionTobacco(); + BeanUtil.fillBeanWithMap(map, sd, true); + baseMapper.insert(sd); + for(List l:listArray){ + log.info("batchInsert-start:{}",l.size()); + baseMapper.batchInsert(l); + log.info("batchInsert-end:{}",l.size()); + } + RowHandler.super.doAfterAllAnalysed(); + } + }; + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java new file mode 100644 index 00000000..4e7d7caa --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsMapper.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsMapper
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface PurchaseRequisitionTobaccoDetailsMapper extends BaseMapper { + @Insert("insert into import_data_info (date,remarks) values('#{date}','#{remarks}')") + void insertIntoImportDataInfo(@Param("date") String date, @Param("remarks") String s); + + void batchInsert(List l); + + //@Update("update purchase_requisition_tobacco_details set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml new file mode 100644 index 00000000..88b3b8a3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsMapper.xml @@ -0,0 +1,19 @@ + + + + + + insert into `purchase_requisition_store` ( `lockVersion`, `sid`, + `createSid`, `modifySid`, `isEnable`, + `createTime`, `modifyTime`, + `state`, `isDelete`, `mainSid`, `yCode`, + `prodCode`, `prodName`, `pfj`, `yhl`, + `ddl`, `price`, `cjmc`, `lszdj`) values + + ('2',UUID(),NULL,NULL,'1', + #{item.createTime}, #{item.createTime},'1','1', + #{item.mainSid},#{item.yCode},#{item.prodCode},#{item.prodName}, + #{item.pfj},#{item.yhl},#{item.ddl},#{item.price},#{item.cjmc},#{item.lszdj}); + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java new file mode 100644 index 00000000..5954e545 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java @@ -0,0 +1,108 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails; + +import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails; +import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsQuery; +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.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsRest.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsRest
+ * Description: 采购订单表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "采购订单表") +@RestController("com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsRest") +@RequestMapping("/purchaserequisitiontobaccodetails") +public class PurchaseRequisitionTobaccoDetailsRest { + + @Autowired + private PurchaseRequisitionTobaccoDetailsService purchaseRequisitionTobaccoDetailsService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = purchaseRequisitionTobaccoDetailsService.listPage(pq); + return rb.success().setData(pv); + } + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = purchaseRequisitionTobaccoDetailsService.list(); + return rb.success().setData(list); + } + + @ApiOperation("保存新增或修改的数据") + @PostMapping("/save") + public ResultBean save(@RequestBody PurchaseRequisitionTobaccoDetails entity) { + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionTobaccoDetailsService.saveOrUpdate(entity); + return rb.success(); + } + @ApiOperation(" ") + @RequestMapping(value = "/importBrandSort", method = RequestMethod.POST) + public ResultBean importBrandSort(@RequestParam("filename") MultipartFile file, @RequestBody String sid){ + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionTobaccoDetailsService.readBrandPeriodSorXls1(file,sid); + return rb; + } + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids) { + ResultBean rb = ResultBean.fireFail(); + purchaseRequisitionTobaccoDetailsService.delByIds(ids); + return rb.success(); + } + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id) { + ResultBean rb = ResultBean.fireFail(); + PurchaseRequisitionTobaccoDetails entity = purchaseRequisitionTobaccoDetailsService.fetchById(id); + return rb.success().setData(entity); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java new file mode 100644 index 00000000..1218f4a1 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java @@ -0,0 +1,178 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails; + + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.poi.excel.ExcelUtil; +import cn.hutool.poi.excel.sax.handler.RowHandler; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; +import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco; +import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails; +import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsQuery; +import com.yxt.common.base.config.component.FileUploadComponent; +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.FileUploadResult; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.biz.purchaserequisitionstore.PurchaseRequisitionStoreService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; + +import org.apache.poi.ss.usermodel.CellStyle; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * Project: yxt-supervise(宇信通监管)
+ * File: PurchaseRequisitionTobaccoDetailsService.java
+ * Class: com.yxt.supervise.portal.biz.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsService
+ * Description: 采购订单表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-28 11:37:55
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Slf4j +@Service +public class PurchaseRequisitionTobaccoDetailsService extends MybatisBaseService { + @Autowired + private FileUploadComponent fileUploadComponent; + @Resource + private PurchaseRequisitionStoreService purchaseRequisitionStoreService; + public PagerVo listPage(PagerQuery pq) { + PurchaseRequisitionTobaccoDetailsQuery 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; + } + + private QueryWrapper createQueryWrapper(PurchaseRequisitionTobaccoDetailsQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getCreateSid())) { + qw.eq("createSid", query.getCreateSid()); + } + + if (StringUtils.isNotBlank(query.getModifySid())) { + qw.eq("modifySid", query.getModifySid()); + } + + return qw; + } + public void readBrandPeriodSorXls1(MultipartFile file,String sid) { + + ResultBean fub = fileUploadComponent.uploadFile(file, "PurchaseRequisitionTobaccoDetails"); + String filePath = fub.getData().getFilePath(); + String fp = fileUploadComponent.getUploadPath() + filePath; + long millis = System.currentTimeMillis(); + ExcelUtil.read07BySax(fp, -1, createRowHandler(sid)); + } + private RowHandler createRowHandler(String sid ) { + return new RowHandler() { + + List lisss=new ArrayList<>(); + List salesDatas=new ArrayList<>(); + int i = 0; + int j = 0; + BigDecimal bigDecimal=new BigDecimal("0"); + @Override + public void handle(int sheetIndex, long rowNum, List r) { + if(rowNum>0){ + Map sd_map=new HashMap<>(); + try{ + sd_map.put("yCode",r.get(0));//卷烟代码 + sd_map.put("storeCode","");//商品代码 + sd_map.put("prodName",r.get(1));//商品名称 + sd_map.put("pfj",r.get(2));//批发价 + sd_map.put("yhl",r.get(3));//要货量 + sd_map.put("ddl",r.get(4));//订单量 + sd_map.put("price",r.get(5));//金额 + BigDecimal price = new BigDecimal(r.get(5).toString()); + bigDecimal= bigDecimal.add(price); + sd_map.put("cjmc",r.get(6));//厂家名称 + sd_map.put("lszdj",r.get(7));//零售指导价 + sd_map.put("mainSid",sid);//关联表sid + PurchaseRequisitionTobaccoDetails sd=new PurchaseRequisitionTobaccoDetails(); + BeanUtil.fillBeanWithMap(sd_map, sd, true); + salesDatas.add(sd); + i++; + }catch(Exception e){ + e.printStackTrace(); + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + baseMapper.insertIntoImportDataInfo(sdf.format(new Date()),"烟草数据明细导入第"+i+"出现异常"+e.getMessage()); + System.err.println("i="+i+",value=null"); + } + lisss.add(rowNum+""); + log.info("productInformation:{}", JSONObject.toJSONString(sd_map)); + log.info("rowNum:{}", rowNum); + } + } + + @Override + public void handleCell(int sheetIndex, long rowIndex, int cellIndex, Object value, CellStyle xssfCellStyle) { + RowHandler.super.handleCell(sheetIndex, rowIndex, cellIndex, value, xssfCellStyle); + } + + @Override + public void doAfterAllAnalysed() { + List> listArray = new ArrayList>(); + int listSize = salesDatas.size(); + int pageSize=5000; + for (int i = 0; i < listSize; i += pageSize) { + int toIndex = Math.min(i + pageSize, listSize); + listArray.add(salesDatas.subList(i, toIndex)); + } + for(List l:listArray){ + log.info("batchInsert-start:{}",l.size()); + baseMapper.batchInsert(l); + log.info("batchInsert-end:{}",l.size()); + } + purchaseRequisitionStoreService.updateDetailsPrice(sid,bigDecimal.toString()); + RowHandler.super.doAfterAllAnalysed(); + } + }; + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java index 737ff523..60f129fa 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/salesdata/SalesDataService.java @@ -432,7 +432,9 @@ public class SalesDataService extends MybatisBaseService0){ + baseMapper.insertsalestest(listss2); + } log.info("结束新增jmdRkmxdOfDay"); //double d=gdInstorageGdService.jmdRkmxdValOfDay(pc); return null; diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.java index 475ca332..e3101b6e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -36,6 +37,7 @@ import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfo; import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfoVo; import java.util.List; +import java.util.Map; /** * Project: supervise(supervise)
@@ -62,4 +64,15 @@ public interface SupplierBankInfoMapper extends BaseMapper { @Select("select * from supplier_bank_info") List selectListVo(); + int delBySids(@Param("list") String[] split); + @Delete("delete from supplier_files where mainSid=#{mainSid} and type=#{type}") + void deleteSupplierFiles(@Param("mainSid")String sid, @Param("type") String type); + + void insertSupplierFiles(List> maps); + @Select("select * from supplier_bank_info where sid=#{sid}") + SupplierBankInfo selectBySid(@Param("sid")String sid); + @Select("select GROUP_CONCAT(url) url from supplier_files where mainSid=#{mainSid} and type=#{type}") + String selectSupplierFiles(@Param("mainSid")String mainSid, @Param("type") String type); + @Select("select * from supplier_bank_info where codeUnified=#{codeUnified}") + SupplierBankInfo selectByCode(@Param("codeUnified") String codeUnified); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.xml index 13c4b130..649fef22 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoMapper.xml @@ -10,4 +10,21 @@ + + delete from supplier_bank_info where sid in + + #{item} + + + + insert into supplier_files ( sid, url, mainSid, type) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR}, + #{item.type,jdbcType=VARCHAR} + ) + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoRest.java index 095be750..62cb39cf 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoRest.java @@ -28,6 +28,9 @@ package com.yxt.supervise.portal.biz.supplierbankinfo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; +import com.yxt.supervise.portal.biz.suppliercontractinfo.SupplierContractInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -61,7 +64,8 @@ public class SupplierBankInfoRest implements SupplierBankInfoFeign { @Autowired private SupplierBankInfoService supplierBankInfoService; - + @Autowired + private SupplierContractInfoService supplierContractInfoService; @Override @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -82,7 +86,7 @@ public class SupplierBankInfoRest implements SupplierBankInfoFeign { @Override @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids){ ResultBean rb = ResultBean.fireFail(); supplierBankInfoService.delBySids(sids); @@ -95,6 +99,8 @@ public class SupplierBankInfoRest implements SupplierBankInfoFeign { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ ResultBean rb = ResultBean.fireFail(); SupplierBankInfoDetailsVo vo = supplierBankInfoService.fetchDetailsVoBySid(sid); + SupplierContractInfoDto supplierContractInfo=supplierContractInfoService.fetchByMainSid(sid); + vo.setSupplierContractInfoDto(supplierContractInfo); return rb.success().setData(vo); } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java index 2085ddbf..444b6ba4 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierbankinfo/SupplierBankInfoService.java @@ -28,6 +28,9 @@ package com.yxt.supervise.portal.biz.supplierbankinfo; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.supervise.portal.api.purchaserequisition.PurchaseRequisition; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; +import com.yxt.supervise.portal.biz.suppliercontractinfo.SupplierContractInfoService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -43,7 +46,8 @@ import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfoFeign; import org.springframework.stereotype.Service; -import java.util.List; +import javax.annotation.Resource; +import java.util.*; /** * Project: supervise(supervise)
@@ -60,10 +64,30 @@ import java.util.List; */ @Service public class SupplierBankInfoService extends MybatisBaseService { + @Resource + private SupplierContractInfoService supplierContractInfoService; private QueryWrapper createQueryWrapper(SupplierBankInfoQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); + + if (StringUtils.isNotBlank(query.getCodeUnified())) { + qw.like("codeUnified", query.getCodeUnified()); + } + if (StringUtils.isNotBlank(query.getName())) { + qw.like("name", query.getName()); + } + if (StringUtils.isNotBlank(query.getContacts())) { + qw.like("contacts", query.getContacts()); + } + if (StringUtils.isNotBlank(query.getLegalRepresentative())) { + qw.like("legalRepresentative", query.getLegalRepresentative()); + } + if (StringUtils.isNotBlank(query.getBusinessLicenseNo())) { + qw.like("businessLicenseNo", query.getBusinessLicenseNo()); + }if (StringUtils.isNotBlank(query.getBankAccountNumber())) { + qw.like("bankAccountNumber", query.getBankAccountNumber()); + } return qw; } @@ -78,9 +102,9 @@ public class SupplierBankInfoService extends MybatisBaseService> maps=new ArrayList<>(); + for(String s:businessLicenseFiles){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("type","1"); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + if(maps.size()>0){ + baseMapper.insertSupplierFiles(maps); + } + } + baseMapper.deleteSupplierFiles(entity.getSid(),"2"); + String[] contractFiles = dto.getContractFiles(); + if(contractFiles!=null){ + List> maps=new ArrayList<>(); + for(String s:contractFiles){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("type","2"); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + if(maps.size()>0){ + baseMapper.insertSupplierFiles(maps); + } + } + SupplierContractInfoDto supplierContractInfoDto = dto.getSupplierContractInfoDto(); + supplierContractInfoDto.setSupplierSid(entity.getSid()); + supplierContractInfoService.saveOrUpdateDto(supplierContractInfoDto); } public void updateByDto(SupplierBankInfoDto dto){ @@ -96,15 +155,68 @@ public class SupplierBankInfoService extends MybatisBaseService> maps=new ArrayList<>(); + for(String s:businessLicenseFiles){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("type","1"); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + baseMapper.insertSupplierFiles(maps); + } + baseMapper.deleteSupplierFiles(entity.getSid(),"2"); + String[] contractFiles = dto.getContractFiles(); + if(contractFiles!=null){ + List> maps=new ArrayList<>(); + for(String s:contractFiles){ + Mapm=new HashMap<>(); + m.put("mainSid",entity.getSid()); + m.put("url",s); + m.put("type","2"); + m.put("sid", UUID.randomUUID().toString()); + maps.add(m); + } + baseMapper.insertSupplierFiles(maps); + } + SupplierContractInfoDto supplierContractInfoDto = dto.getSupplierContractInfoDto(); + supplierContractInfoDto.setSupplierSid(entity.getSid()); + supplierContractInfoService.saveOrUpdateDto(supplierContractInfoDto); + } + public ResultBean delBySids(String sids) { + ResultBean resultBean = ResultBean.fireFail(); + String[] split = sids.split(","); + int i= baseMapper.delBySids(split); + return resultBean.success().setData("1"); } - public SupplierBankInfoDetailsVo fetchDetailsVoBySid(String sid){ - SupplierBankInfo entity = fetchBySid(sid); + SupplierBankInfo entity = baseMapper.selectBySid(sid); SupplierBankInfoDetailsVo vo = new SupplierBankInfoDetailsVo(); BeanUtil.copyProperties(entity, vo); + String s1=baseMapper.selectSupplierFiles(sid,"1"); + if(StringUtils.isNotBlank(s1)){ + vo.setBusinessLicenseFiles(s1.split(",")); + }else{ + vo.setBusinessLicenseFiles(new String[]{}); + } + + String s2=baseMapper.selectSupplierFiles(sid,"2"); + if(StringUtils.isNotBlank(s2)){ + vo.setContractFiles(s2.split(",")); + }else{ + vo.setContractFiles(new String[]{}); + } return vo; } + + public SupplierBankInfo selectByCode(String codeUnified) { + return baseMapper.selectByCode(codeUnified); + } } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.java new file mode 100644 index 00000000..cda1e6d2 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.suppliercontractinfo; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoVo; + +import java.util.List; +import java.util.Map; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoMapper.java
+ * Class: com.yxt.supervise.portal.biz.suppliercontractinfo.SupplierContractInfoMapper
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SupplierContractInfoMapper extends BaseMapper { + + //@Update("update supplier_contract_info 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 supplier_contract_info") + List selectListVo(); + @Select("select * from supplier_contract_info where supplierSid=#{sid}") + SupplierContractInfoDto fetchByMainSid(@Param("sid") String sid); + @Delete("delete from supplier_files where mainSid=#{mainSid} and type=#{type}") + void deleteSupplierFiles(@Param("mainSid")String sid, @Param("type") String type); + void insertSupplierFiles(List> maps); + @Delete("delete from supplier_contract_info where supplierSid=#{supplierSid} ") + void deleteBySupplierSid(@Param("supplierSid") String supplierSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.xml new file mode 100644 index 00000000..7d17a31b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + insert into supplier_files ( sid, url, mainSid, type) values + + ( + #{item.sid,jdbcType=VARCHAR}, + #{item.url,jdbcType=VARCHAR}, + #{item.mainSid,jdbcType=VARCHAR}, + #{item.type,jdbcType=VARCHAR} + ) + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoRest.java new file mode 100644 index 00000000..8586fef7 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.suppliercontractinfo; + +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.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoQuery; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoVo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDetailsVo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoFeign; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoFeignFallback.java
+ * Class: com.yxt.supervise.portal.biz.suppliercontractinfo.SupplierContractInfoRest
+ * Description: 供应商信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商信息") +@RestController("com.yxt.supervise.portal.biz.suppliercontractinfo.SupplierContractInfoRest") +@RequestMapping("v1/suppliercontractinfo") +public class SupplierContractInfoRest implements SupplierContractInfoFeign { + + @Autowired + private SupplierContractInfoService supplierContractInfoService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = supplierContractInfoService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierContractInfoDto dto){ + ResultBean rb = ResultBean.fireFail(); + supplierContractInfoService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierContractInfoService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + SupplierContractInfoDetailsVo vo = supplierContractInfoService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoService.java new file mode 100644 index 00000000..c0dd332a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/suppliercontractinfo/SupplierContractInfoService.java @@ -0,0 +1,115 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.suppliercontractinfo; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +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 com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoQuery; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoVo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDetailsVo; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoDto; +import com.yxt.supervise.portal.api.suppliercontractinfo.SupplierContractInfoFeign; + +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + * Project: supervise(监管)
+ * File: SupplierContractInfoService.java
+ * Class: com.yxt.supervise.portal.biz.suppliercontractinfo.SupplierContractInfoService
+ * Description: 供应商信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-21 11:53:49
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SupplierContractInfoService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(SupplierContractInfoQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SupplierContractInfoQuery 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 void saveOrUpdateDto(SupplierContractInfoDto dto){ + baseMapper.deleteBySupplierSid(dto.getSupplierSid()); + /*String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) {*/ + this.insertByDto(dto); + return; + /* } + this.updateByDto(dto);*/ + } + + public void insertByDto(SupplierContractInfoDto dto){ + SupplierContractInfo entity = new SupplierContractInfo(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(SupplierContractInfoDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + SupplierContractInfo entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public SupplierContractInfoDetailsVo fetchDetailsVoBySid(String sid){ + SupplierContractInfo entity = fetchBySid(sid); + SupplierContractInfoDetailsVo vo = new SupplierContractInfoDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public SupplierContractInfoDto fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndex.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndex.java deleted file mode 100644 index e504373d..00000000 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndex.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.supervise.portal.biz.supplierindex; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.EntityWithId; -import lombok.Data; - -@Data -@TableName("supplier_index") -public class SupplierIndex extends EntityWithId { - private String code; // 编码 - private String name; // 名称 - private String codeUnified; // 统一的编码 - private String nameUnified; // 统一的名称 - private String remarks; // 备注说明 -} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.java index 6999ae04..fe1c32b9 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.java @@ -1,8 +1,79 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ package com.yxt.supervise.portal.biz.supplierindex; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexDetailsVo; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexDto; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndex; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexVo; +import java.util.List; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexMapper.java
+ * Class: com.yxt.supervise.portal.biz.supplierindex.SupplierIndexMapper
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ @Mapper public interface SupplierIndexMapper extends BaseMapper { -} + + //@Update("update supplier_index 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 supplier_index") + List selectListVo(); + @Delete("delete from supplier_index where codeUnified=#{codeUnified}") + void deleteSupplierIndexByCodeUnified(@Param("codeUnified") String codeUnified); + void batchSupplierIndexs(List supplierIndexDto); + @Select("select * from supplier_index where codeUnified=#{codeUnified}") + List fetchDetailsVosBycodeUnified(@Param("codeUnified") String codeUnified); + @Select("select * from supplier_index where code=#{code}") + SupplierIndex selectByCode(@Param("code") String code); + + void insertSupplierIndex(SupplierIndex si); + @Select("select * from supplier_index where code=#{code} or name=#{name}") + List selectByCodeAndName(@Param("code") String code, @Param("name") String name); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.xml new file mode 100644 index 00000000..17c77e6c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + insert into supplier_index(code,name,codeUnified,psid) values + + ( + #{item.code,jdbcType=VARCHAR}, + #{item.name,jdbcType=VARCHAR}, + #{item.codeUnified,jdbcType=VARCHAR}, + #{item.PSid,jdbcType=VARCHAR} + ) + + + + INSERT INTO supplier_index ( code, name, codeUnified, psid ) values + ( + #{code,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, + #{codeUnified,jdbcType=VARCHAR}, + #{PSid,jdbcType=VARCHAR} + ) + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexRest.java new file mode 100644 index 00000000..5a4f4ceb --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexRest.java @@ -0,0 +1,153 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.supervise.portal.biz.supplierindex; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfo; +import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfoDetailsVo; +import com.yxt.supervise.portal.biz.supplierbankinfo.SupplierBankInfoService; +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.HashMap; +import java.util.List; +import java.util.Map; + +import com.yxt.supervise.portal.api.supplierindex.SupplierIndex; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexQuery; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexVo; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexDetailsVo; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexDto; +import com.yxt.supervise.portal.api.supplierindex.SupplierIndexFeign; + +/** + * Project: supervise(宇信通监管)
+ * File: SupplierIndexFeignFallback.java
+ * Class: com.yxt.supervise.portal.biz.supplierindex.SupplierIndexRest
+ * Description: 供货商编码对应表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-12-23 15:44:32
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供货商编码对应表") +@RestController("com.yxt.supervise.portal.biz.supplierindex.SupplierIndexRest") +@RequestMapping("v1/supplierindex") +public class SupplierIndexRest implements SupplierIndexFeign { + + @Autowired + private SupplierIndexService supplierIndexService; + @Autowired + private SupplierBankInfoService supplierBankInfoService; + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = supplierIndexService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierIndexDto dto){ + ResultBean rb = ResultBean.fireFail(); + supplierIndexService.saveOrUpdateDto(dto); + return rb.success(); + } + @Override + @ApiOperation("保存关联供应商信息-验证") + @PostMapping("/verification") + public ResultBean verification(@RequestBody SupplierIndexDto dto){ + ResultBean rb = ResultBean.fireFail(); + String code = dto.getCode(); + String codeUnified = dto.getCodeUnified(); + String name = dto.getName(); + List supplierIndex = supplierIndexService.selectByCodeAndName(code,name); + if(supplierIndex==null||supplierIndex.size()==0){ + SupplierIndex si=new SupplierIndex(); + si.setCode(code); + si.setName(name); + si.setCodeUnified(codeUnified); + SupplierBankInfo supplierBankInfo=supplierBankInfoService.selectByCode(codeUnified); + si.setPSid(supplierBankInfo.getSid()); + supplierIndexService.insertSupplierIndex(si); + return rb.success().setMsg("操作成功!"); + } + return rb.success().setMsg("该供应商已存在关联关系，是否改变关联关系？"); + } + @Override + @ApiOperation("保存关联供应商信息-新增保存") + @PostMapping("/verificationSave") + @ResponseBody + public ResultBean verificationSave(@RequestBody SupplierIndexDto dto){ + ResultBean rb = ResultBean.fireFail(); + String code = dto.getCode(); + String codeUnified = dto.getCodeUnified(); + String name = dto.getName(); + SupplierIndex si=new SupplierIndex(); + si.setCode(code); + si.setName(name); + si.setCodeUnified(codeUnified); + SupplierBankInfo supplierBankInfo=supplierBankInfoService.selectByCode(codeUnified); + si.setPSid(supplierBankInfo.getSid()); + supplierIndexService.insertSupplierIndex(si); + return rb.success().setMsg("操作成功!"); + } + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierIndexService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + SupplierBankInfoDetailsVo supplierBankInfoDetailsVo = supplierBankInfoService.fetchDetailsVoBySid(sid); + List vos = supplierIndexService.fetchDetailsVosBycodeUnified(supplierBankInfoDetailsVo.getCodeUnified()); + Map vo=new HashMap<>(); + vo.put("codeUnified",supplierBankInfoDetailsVo.getCodeUnified()); + vo.put("name",supplierBankInfoDetailsVo.getName()); + vo.put("legalRepresentative",supplierBankInfoDetailsVo.getLegalRepresentative()); + vo.put("businessLicenseNo",supplierBankInfoDetailsVo.getBusinessLicenseNo()); + vo.put("psid",supplierBankInfoDetailsVo.getSid()); + vo.put("list",vos); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java index 38242c51..a92f95ec 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/supplierindex/SupplierIndexService.java @@ -1,6 +1,15 @@ package com.yxt.supervise.portal.biz.supplierindex; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.vo.PagerVo; +import com.yxt.supervise.portal.api.supplierindex.*; import org.springframework.stereotype.Service; import java.util.HashMap; @@ -8,7 +17,7 @@ import java.util.List; import java.util.Map; @Service -public class SupplierIndexService extends ServiceImpl { +public class SupplierIndexService extends MybatisBaseService { private static List cacheList = null; private static Map cacheCodeMap = null; @@ -27,4 +36,71 @@ public class SupplierIndexService extends ServiceImpl fetchDetailsVosBycodeUnified(String codeUnified) { + return baseMapper.fetchDetailsVosBycodeUnified(codeUnified); + } + + public SupplierIndex selectByCode(String code) { + return baseMapper.selectByCode(code); + } + private QueryWrapper createQueryWrapper(SupplierIndexQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SupplierIndexQuery 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 void saveOrUpdateDto(SupplierIndexDto dto){ + String dtoSid = dto.getSid(); + List supplierIndexDto = dto.getList(); + baseMapper.deleteSupplierIndexByCodeUnified(dto.getCodeUnified()); + supplierIndexDto.forEach(s->{ + s.setPSid(dtoSid); + }); + if(supplierIndexDto.size()>0){ + baseMapper.batchSupplierIndexs(supplierIndexDto); + } + } + + public void insertByDto(SupplierIndexDto dto){ + SupplierIndex entity = new SupplierIndex(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(SupplierIndexDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + SupplierIndex entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public void insertSupplierIndex(SupplierIndex si) { + baseMapper.insertSupplierIndex(si); + } + + public List selectByCodeAndName(String code, String name) { + return baseMapper.selectByCodeAndName(code,name); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.java new file mode 100644 index 00000000..da4a08d4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.java @@ -0,0 +1,59 @@ +package com.yxt.supervise.portal.biz.sysfunction; + +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.anrui.portal.api.sysfunction.SysFunction; +import com.yxt.anrui.portal.api.sysfunction.SysFunctionTreeVo; +import com.yxt.anrui.portal.api.sysfunction.SysFunctionVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionMapper.java
+ * Class: SysFunctionMapper
+ * 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 SysFunctionMapper extends BaseMapper { + + //@Update("update sys_function 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_function") + List selectListVo(); + + List listAllParentByRoleSid(String roleSid, String sid); + + List getChildrensForFunctionTree(@Param(Constants.WRAPPER) QueryWrapper qw); + + List selectChildernList(String sid); + + int updateBySourceSid(@Param("isEnable") Integer isEnable, @Param("list") List list); + + /** + * 该资源下的功能是否可用 状态为1的功能 + * + * @param isEnable 是否可用，1可用，0不可用 + * @param sourceSid 资源sid + * @return + */ + int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.xml new file mode 100644 index 00000000..ecd80ee4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionMapper.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + UPDATE sys_function + SET isEnable = #{isEnable} WHERE sid IN + + #{item} + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionRest.java new file mode 100644 index 00000000..251f79e7 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionRest.java @@ -0,0 +1,195 @@ +package com.yxt.supervise.portal.biz.sysfunction; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.portal.api.sysfunction.*; +import com.yxt.anrui.portal.api.syssource.SysSource; +import com.yxt.anrui.portal.api.syssource.SysSourceVo; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunction; +import com.yxt.supervise.portal.biz.syssource.SysSourceService; +import com.yxt.supervise.portal.biz.syssourcefunction.SysSourceFunctionService; +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 io.swagger.annotations.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionFeignFallback.java
+ * Class: SysFunctionRest
+ * 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/sysfunction") +public class SysFunctionRest implements SysFunctionFeign { + + @Autowired + private SysFunctionService sysFunctionService; + @Autowired + private SysSourceService sysSourceService; + @Autowired + private SysSourceFunctionService sysSourceFunctionService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysFunctionService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysFunctionQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysFunctionService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> listAllByRoleSid(SysFunctionQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysFunctionService.listAllByRoleSid(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> listAllVoForSource(@RequestBody SysFunctionQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysFunctionService.listAllVoForSource(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysFunctionService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysFunctionDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sourceSid = dto.getSourceSid(); + if (StringUtils.isBlank(sourceSid)) { + return ResultBean.fireFail().setMessage("资源不能为空"); + } else { + SysSourceVo sysSourceVo = sysSourceService.fetchBySidVo(sourceSid); + if (sysSourceVo.getSid() == null) { + return ResultBean.fireFail().setMessage("资源不存在"); + } + } + String pSid = dto.getParentSid(); + if (StringUtils.isBlank(pSid)) { + return ResultBean.fireFail().setMessage("菜单父级sid不能为空"); + } else { + if (!"0".equals(pSid)) { + SysFunction sysFunction = sysFunctionService.fetchBySid(pSid); + if (StringUtils.isBlank(sysFunction.getSid())) { + return ResultBean.fireFail().setMessage("菜单父级不存在!"); + } + } + } + sysFunctionService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysFunctionDto dto, String sid) { + SysFunction sysFunction = sysFunctionService.fetchBySid(sid); + if (sysFunction.getSid() == null) { + return ResultBean.fireFail().setMessage("功能不存在!"); + } + ResultBean rb = ResultBean.fireFail(); + sysFunctionService.updateBySid(dto.toMap(), sid); + SysSourceFunction sysSourceFunction1 = sysSourceFunctionService.fetchByFunctionSid(sid); + sysSourceFunctionService.delByFunctionSid(sid); + SysSourceFunction sysSourceFunction = new SysSourceFunction(); + sysSourceFunction.setFunctionRootSid(sysSourceFunction1.getFunctionRootSid()); + sysSourceFunction.setFunctionSid(sid); + sysSourceFunction.setSourceSid(dto.getSourceSid()); + sysSourceFunctionService.insert(sysSourceFunction); + return rb.success(); + } + + @Override + public ResultBean updateIsEnable(String sid, Integer isEnable) { + ResultBean rb = ResultBean.fireFail(); + SysFunction sysFunction = sysFunctionService.fetchBySid(sid); + if (sysFunction == null) { + //查询资源是否存在 + SysSource sysSource = sysSourceService.fetchBySid(sid); + if (sysSource == null) { + return ResultBean.fireFail().setMessage("功能不存在!"); + } else { + //将该资源下的所有功能关闭 + List sids = sysSourceFunctionService.selectBySourceSid(sid); + if (sids.size() != 0) { + sysFunctionService.updateBySourceSid(isEnable, sids); + } + + } + } else { + sysFunction.setIsEnable(isEnable); + sysFunctionService.updateById(sysFunction); + } + + return rb.success(); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysFunctionService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean delBySids(String sids) { + ResultBean rb = ResultBean.fireFail(); + String[] sidsArr = sids.split(","); + for (String functionSid : sidsArr) { + sysSourceFunctionService.delByFunctionSid(functionSid); + } + sysFunctionService.delBySids(sidsArr); + return rb.success(); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysFunctionVo vo = sysFunctionService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysFunction entity = sysFunctionService.fetchBySid(sid); + SysFunctionVo vo = new SysFunctionVo(); + BeanUtil.copyProperties(entity, vo); + SysSourceFunction sysSourceFunction = sysSourceFunctionService.fetchByFunctionSid(sid); + vo.setSourceSid(sysSourceFunction.getSourceSid()); + if ("0".equals(entity.getParentSid())) { + vo.setParentSid("0"); + vo.setParentName("顶级功能"); + } else { + SysFunction sysFunction = sysFunctionService.fetchBySid(entity.getParentSid()); + vo.setParentSid(sysFunction.getSid()); + vo.setParentName(sysFunction.getName()); + } + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionService.java new file mode 100644 index 00000000..bdb28a62 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysfunction/SysFunctionService.java @@ -0,0 +1,237 @@ +package com.yxt.supervise.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.anrui.portal.api.sysfunction.*; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunction; +import com.yxt.supervise.portal.biz.syssource.SysSourceService; +import com.yxt.supervise.portal.biz.syssourcefunction.SysSourceFunctionService; +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 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; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysFunctionService.java
+ * Class: SysFunctionService
+ * 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 SysFunctionService extends MybatisBaseService { + @Autowired + private SysSourceService sysSourceService; + @Autowired + private SysSourceFunctionService sysSourceFunctionService; + public PagerVo listPage(PagerQuery pq) { + SysFunctionQuery 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(SysFunctionQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysFunctionQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("name", query.getName()); + } + + if (query.getLevel() != null) { + qw.eq("level", query.getLevel()); + } + + if (StringUtils.isNotBlank(query.getParentSid())) { + qw.eq("parentSid", query.getParentSid()); + } + + if (StringUtils.isNotBlank(query.getActionUrl())) { + qw.eq("actionUrl", query.getActionUrl()); + } + + if (StringUtils.isNotBlank(query.getControllerName())) { + qw.eq("controllerName", query.getControllerName()); + } + + if (StringUtils.isNotBlank(query.getFunId())) { + qw.eq("funId", query.getFunId()); + } + + if (query.getPhoneFunction() != null) { + qw.eq("phoneFunction", query.getPhoneFunction()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysFunctionQuery 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(SysFunctionQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("func.parentSid", "0"); + List sysFunctionVos = baseMapper.selectListAllVo(qw); + for(SysFunctionVo s:sysFunctionVos){ + getChildrens(s); + } + return sysFunctionVos; + } + private void getChildrens(SysFunctionVo s){ + String sid = s.getSid(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("func.parentSid", sid); + } + List sysFunctionVos = baseMapper.selectListAllVo(qw); + if(!sysFunctionVos.isEmpty()){ + for(SysFunctionVo sfv:sysFunctionVos){ + getChildrens(sfv); + } + } + s.setChildren(sysFunctionVos); + } + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysFunctionDto dto){ + SysFunction entity = new SysFunction(); + dto.fillEntity(entity); + SysSourceFunction sysSourceFunction = new SysSourceFunction(); + sysSourceFunction.setFunctionSid(entity.getSid()); + sysSourceFunction.setSourceSid(dto.getSourceSid()); + setRootSid(entity,sysSourceFunction); + sysSourceFunctionService.save(sysSourceFunction); + this.saveOrUpdate(entity); + } + private void setRootSid(SysFunction entity,SysSourceFunction sysSourceFunction){ + String pSid = entity.getParentSid(); + if("0".equals(pSid)){ + sysSourceFunction.setFunctionRootSid(entity.getSid()); + }else{ + SysFunction sysFunction = this.fetchBySid(pSid); + String pSid1 = sysFunction.getParentSid(); + if("0".equals(pSid1)){ + sysSourceFunction.setFunctionRootSid(sysFunction.getSid()); + } + setRootSid(sysFunction,sysSourceFunction); + } + } + public SysFunctionVo fetchByIdVo(String id){ + SysFunction entity = this.fetchById(id); + SysFunctionVo vo = new SysFunctionVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List listAllByRoleSid(SysFunctionQuery query) { + List sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(),"0"); + for(SysFunctionVo s:sysFunctionVos){ + getChildrensByRoleSid(s,query.getRoleSid()); + } + return sysFunctionVos; + } + private void getChildrensByRoleSid(SysFunctionVo s,String roleSid){ + List sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid,s.getSid()); + if(!sysFunctionVos.isEmpty()){ + for(SysFunctionVo sfv:sysFunctionVos){ + getChildrensByRoleSid(sfv,roleSid); + } + } + s.setChildren(sysFunctionVos); + } + + public List listAllVoForSource(SysFunctionQuery query) { + String name = query.getName(); + List sysSourceVos = sysSourceService.listFunctionTreeVo(name); + for (SysFunctionTreeVo s : sysSourceVos) { + List sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid()); + s.setChildren(sysFunctionVoList); + s.setIsSource("1"); + //判断该资源下的功能是否有可用的状态 + int isEnable = 1; + int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid()); + if (count == 0) { + s.setIsEnable("0"); + } else { + s.setIsEnable("1"); + } + if (!sysFunctionVoList.isEmpty()) { +// sysFunctionVoList = getChildrensForFunctionTree(sysFunctionVoList); + getChildList(sysFunctionVoList); + } + } + return sysSourceVos; + } + + public void getChildList(List list) { + list.forEach(str -> { + String sid = str.getSid(); + List listChildren = baseMapper.selectChildernList(sid); + str.setChildren(listChildren); + getChildList(listChildren); + }); + } + + private List getChildrensForFunctionTree(List sysFunctionVoList) { + List list = new ArrayList<>(); + for (SysFunctionTreeVo s : sysFunctionVoList) { + SysFunction sysFunction = fetchBySid(s.getFunctionRootSid()); + SysFunctionTreeVo sysFunctionTreeVo = new SysFunctionTreeVo(); + BeanUtil.copyProperties(sysFunction, sysFunctionTreeVo); + /*sysFunctionTreeVo.setParentName("顶级功能");*/ + list.add(sysFunctionTreeVo); + } + for (SysFunctionTreeVo s : list) { + getChildrensForFunctionTree(s, s.getSid()); + } + return list; + } + + private void getChildrensForFunctionTree(SysFunctionTreeVo s, String sid) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("func.parentSid", sid); + } + List sysMenuVos = baseMapper.getChildrensForFunctionTree(qw); + if (!sysMenuVos.isEmpty()) { + for (SysFunctionTreeVo smv : sysMenuVos) { + /*SysFunction sysFunction = fetchBySid(sid); + smv.setParentName(sysFunction.getName());*/ + getChildrensForFunctionTree(smv, smv.getSid()); + } + } + s.setChildren(sysMenuVos); + } + + public int updateBySourceSid(Integer isEnable, List sids) { + return baseMapper.updateBySourceSid(isEnable, sids); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.java new file mode 100644 index 00000000..ab29759a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.java @@ -0,0 +1,75 @@ +package com.yxt.supervise.portal.biz.sysmenu; + +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.anrui.portal.api.sysmenu.SysMenu; +import com.yxt.anrui.portal.api.sysmenu.SysMenuTreeVo; +import com.yxt.anrui.portal.api.sysmenu.SysMenuVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuMapper.java
+ * Class: SysMenuMapper
+ * 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 SysMenuMapper extends BaseMapper { + + //@Update("update sys_menu 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") + List selectListVo(); + + List listAllParentByRoleSid(String roleSid, String sid, @Param("sourceSid") String sourceSid); + + @Select("SELECT menu.*,sourceMenu.`sourceSid` FROM sys_menu menu " + + "LEFT JOIN sys_source_menu sourceMenu ON menu.sid=sourceMenu.menuSid where menu.sid=#{sid}") + SysMenu fetchBySid(@Param("sid") String sid); + + List getChildrensForMenuTree(@Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 将该资源下的所有菜单设置是否可用 + * + * @param sid 资源sid + * @param isEnable 是否可用：1可用，0不可用 + * @return + */ + int updateBySourceSid(@Param("sid") String sid, @Param("isEnable") Integer isEnable); + + /** + * 根据上级sid查询菜单的子集菜单 + * + * @param sid 菜单sid + * @return + */ + List selectChildernList(String sid); + + /** + * 查询该资源下是否有可用的菜单 + * + * @param isEnable + * @return + */ + int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.xml new file mode 100644 index 00000000..9cd98b67 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + update sys_menu + set isEnable = #{isEnable} + where sourceSid = #{sid} + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuRest.java new file mode 100644 index 00000000..14c54bb7 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuRest.java @@ -0,0 +1,227 @@ +package com.yxt.supervise.portal.biz.sysmenu; + +import com.yxt.anrui.portal.api.sysmenu.*; +import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery; +import com.yxt.anrui.portal.api.syssource.SysSource; +import com.yxt.anrui.portal.api.syssource.SysSourceVo; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenu; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuVo; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo; +import com.yxt.supervise.portal.biz.sysmenurole.SysMenuRoleService; +import com.yxt.supervise.portal.biz.sysrole.SysRoleService; +import com.yxt.supervise.portal.biz.syssource.SysSourceService; +import com.yxt.supervise.portal.biz.syssourcemenu.SysSourceMenuService; +import com.yxt.supervise.portal.biz.sysuser.SysUserService; +import com.yxt.supervise.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 io.swagger.annotations.Api; +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 java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuFeignFallback.java
+ * Class: SysMenuRest
+ * 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/sysmenu") +public class SysMenuRest implements SysMenuFeign { + @Autowired + private SysSourceMenuService sysSourceMenuService; + @Autowired + private SysMenuService sysMenuService; + @Autowired + private SysSourceService sysSourceService; + @Autowired + private SysUserRoleService sysUserRoleService; + @Autowired + private SysMenuRoleService sysMenuRoleService; + @Autowired + private SysUserService sysUserService; + @Autowired + private SysRoleService sysRoleService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysMenuService.listPageVo(pq); + return rb.success().setData(pv); + } + + /* @Override + public ResultBean> listAll(@RequestBody SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuService.listAllVo(query); + return rb.success().setData(list); + }*/ + + @Override + public ResultBean> listAllVoForSource(@RequestBody SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuService.listAllVoForSource(query); + return rb.success().setData(list); + } + + @Override + public ResultBean>> sourcemenutree(SysMenuQuery query) { + ResultBean>> rb = ResultBean.fireFail(); + SysMenuRoleQuery orgRoleMenuQuery = new SysMenuRoleQuery(); + List> list = new ArrayList<>(); + if (null == query) + return rb.setData(list); + + //if业务角色存在，则查询业务角色的菜单列表，否则查询平台角色的菜单列表 + List userRole = sysUserRoleService.selectByUserSid(query.getUserSid()); + List roleSids = userRole.stream().map(s -> s.getRoleSid()).collect(Collectors.toList()); + for (String roleSid : roleSids) { + 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); + } + + @Override + public ResultBean> listAllByRoleSid(SysMenuQuery query) { + ResultBean rb = ResultBean.fireFail(); + String roleSid = query.getRoleSid(); + if (StringUtils.isBlank(roleSid)) { + ResultBean> resultBean = new ResultBean>(); + return resultBean.fail().setMessage("角色sid不能为空!"); + } + List sysSourceVos = sysSourceService.listVo(); + List list = new ArrayList<>(); + for (SysSourceVo s : sysSourceVos) { + SysMenuVo sysMenuVo = new SysMenuVo(); + sysMenuVo.setName(s.getSourceName()); + sysMenuVo.setSid(s.getSid()); + sysMenuVo.setChecked("1"); + query.setSourceSid(s.getSid()); + sysMenuVo.setChildren(sysMenuService.listAllByRoleSid(query)); + list.add(sysMenuVo); + } + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysMenuDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sourceSid = dto.getSourceSid(); + SysSource sysSource = sysSourceService.fetchBySid(sourceSid); + if (sysSource == null) { + return rb.setMsg("资源不存在"); + } + sysMenuService.saveMenu(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysMenuDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + //查询菜单是否存在 + SysMenu sysMenu = sysMenuService.fetchBySid(sid); + if (sysMenu == null) { + return rb.setMsg("菜单不存在"); + } + String sourceSid = dto.getSourceSid(); + SysSourceMenuVo vo = sysSourceMenuService.fetchByMenuSid(sid); + if (!sourceSid.equals(vo.getSourceSid())) { + sysSourceMenuService.delByMenuSid(sid); + SysSourceMenu sysSourceMenu = new SysSourceMenu(); + sysSourceMenu.setMenuSid(sid); + sysSourceMenu.setSourceSid(dto.getSourceSid()); + sysSourceMenu.setMenuRootSid(vo.getMenuRootSid()); + sysSourceMenuService.save(sysSourceMenu); + } + sysMenuService.updateBySid(dto, sid); + return rb.success(); + } + + @Override + public ResultBean updateIsEnable(String sid, Integer isEnable) { + ResultBean rb = ResultBean.fireFail(); + SysMenu sysMenu = sysMenuService.fetchBySid(sid); + if (sysMenu == null) { + //查询资源是否存在 + SysSource sysSource = sysSourceService.fetchBySid(sid); + if (sysSource == null) { + return ResultBean.fireFail().setMessage("菜单不存在!"); + } else { + //将该资源下的所有菜单关闭 + sysMenuService.updateBySourceSid(sid, isEnable); + } + } else { + sysMenu.setIsEnable(isEnable); + sysMenuService.updateById(sysMenu); + } + + return rb.success(); + } + + /* @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysMenuService.delByIds(ids); + return rb.success(); + }*/ + + @Override + public ResultBean delBySids(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMenu sysMenu = sysMenuService.fetchBySid(sid); + if (sysMenu == null) { + return rb.setMsg("该菜单不存在"); + } + sysSourceMenuService.delByMenuSid(sid); + sysMenuService.deleteBySid(sid); + return rb.success(); + } + + /* @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysMenuVo vo = sysMenuService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysMenu sysMenu = sysMenuService.fetchBySid(sid); + SysMenuVo vo = new SysMenuVo(); + BeanUtil.copyProperties(sysMenu, vo); + return rb.success().setData(vo); + }*/ +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuService.java new file mode 100644 index 00000000..73ca9e53 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenu/SysMenuService.java @@ -0,0 +1,412 @@ +package com.yxt.supervise.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.anrui.portal.api.sysmenu.*; +import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenu; +import com.yxt.supervise.portal.biz.syssource.SysSourceService; +import com.yxt.supervise.portal.biz.syssourcemenu.SysSourceMenuService; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuService.java
+ * Class: SysMenuService
+ * 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 SysMenuService extends MybatisBaseService { + @Autowired + private SysSourceMenuService sysSourceMenuService; + @Autowired + private SysMenuService sysMenuService; + @Autowired + private SysSourceService sysSourceService; + + public PagerVo listPage(PagerQuery pq) { + SysMenuQuery 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; + } + + @Override + public SysMenu fetchBySid(String sid) { + return baseMapper.fetchBySid(sid); + } + + public List listAll(SysMenuQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysMenuQuery query) { + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("name", query.getName()); + } + if (StringUtils.isNotBlank(query.getMenuUrl())) { + qw.eq("menuUrl", query.getMenuUrl()); + } + if (StringUtils.isNotBlank(query.getPageUrl())) { + qw.eq("pageUrl", query.getPageUrl()); + } + if (StringUtils.isNotBlank(query.getIconUrl())) { + qw.eq("iconUrl", query.getIconUrl()); + } + if (query.getSourceSid() != null) { + qw.eq("sourceSid", query.getSourceSid()); + } + if (StringUtils.isNotBlank(query.getIsShow())) { + qw.eq("isShow", query.getIsShow()); + } + + if (query.getSortNo() != null) { + qw.eq("sortNo", query.getSortNo()); + } + + if (StringUtils.isNotBlank(query.getPSid())) { + qw.eq("pSid", query.getPSid()); + } + + if (query.getPageUrlRedirect() != null) { + qw.eq("pageUrlRedirect", query.getPageUrlRedirect()); + } + + if (StringUtils.isNotBlank(query.getPageName())) { + qw.eq("pageName", query.getPageName()); + } + + if (StringUtils.isNotBlank(query.getPageAliasName())) { + qw.eq("pageAliasName", query.getPageAliasName()); + } + + if (StringUtils.isNotBlank(query.getMenuType())) { + qw.eq("menuType", query.getMenuType()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysMenuQuery 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(SysMenuQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("menu.pSid", "0"); + List sysMenuVos = baseMapper.selectListAllVo(qw); + for(SysMenuVo s:sysMenuVos){ + getChildrens(s); + } + return sysMenuVos; + }*/ + public List listAllVoForSource(SysMenuQuery query) { + //查询所有的资源列表 + List sysSourceVos = sysSourceService.listMenuTreeVo(); + for (SysMenuTreeVo s : sysSourceVos) { + //根据资源sid查询该资源下的所有单位 + List sysMenuVoList = sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid()); + s.setChildren(sysMenuVoList); + s.setIsSource("1"); + //判断该资源下的菜单是否有可用的状态 + int isEnable = 1; + int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid()); + if (count == 0) { + s.setIsEnable("0"); + } else { + s.setIsEnable("1"); + } + if (!sysMenuVoList.isEmpty()) { +// sysMenuVoList = getChildrensForMenuTree(sysMenuVoList); + getChildList(sysMenuVoList); + } + } + return sysSourceVos; + } + + public void getChildList(List list) { + list.forEach(str -> { + String sid = str.getSid(); + List listChildren = baseMapper.selectChildernList(sid); + str.setChildren(listChildren); + getChildList(listChildren); + }); + } + + /*暂时废弃*/ + /*private List getChildrensForMenuTree(List sysMenuVoList) { + List list = new ArrayList<>(); + for (SysMenuTreeVo s : sysMenuVoList) { + SysMenu sysMenu = sysMenuService.fetchBySid(s.getMenuRootSid()); + SysMenuTreeVo sysMenuTreeVo = new SysMenuTreeVo(); + BeanUtil.copyProperties(sysMenu, sysMenuTreeVo); + list.add(sysMenuTreeVo); + } + for (SysMenuTreeVo s : list) { + getChildrensForMenuTree(s, s.getSid()); + } + return list; + } + private void getChildrensForMenuTree(SysMenuTreeVo s,String sid){ + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("menu.pSid", sid); + } + List sysMenuVos = baseMapper.getChildrensForMenuTree(qw); + if(!sysMenuVos.isEmpty()){ + for(SysMenuTreeVo smv:sysMenuVos){ + getChildrensForMenuTree(smv,smv.getSid()); + } + } + s.setChildren(sysMenuVos); + } + private void getChildrens(SysMenuVo s){ + String sid = s.getSid(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(sid)) { + qw.eq("menu.pSid", sid); + } + List sysMenuVos = baseMapper.selectListAllVo(qw); + if(!sysMenuVos.isEmpty()){ + for(SysMenuVo smv:sysMenuVos){ + getChildrens(smv); + } + } + s.setChildren(sysMenuVos); + }*/ + public List listVo() { + return baseMapper.selectListVo(); + } + + /* public void saveOrUpdateDto(SysMenuDto dto) { + SysMenu entity = new SysMenu(); + dto.fillEntity(entity); + SysSourceMenu sysSourceMenu = new SysSourceMenu(); + sysSourceMenu.setMenuSid(entity.getSid()); + sysSourceMenu.setSourceSid(dto.getSourceSid()); + setRootSid(entity, sysSourceMenu); + sysSourceMenuService.save(sysSourceMenu); + this.saveOrUpdate(entity); + }*/ + + private void setRootSid(SysMenu entity, SysSourceMenu sysSourceMenu) { + String pSid = entity.getPSid(); + if ("0".equals(pSid)) { + sysSourceMenu.setMenuRootSid(entity.getSid()); + } else { + SysMenu sysMenu = sysMenuService.fetchBySid(pSid); + String pSid1 = sysMenu.getPSid(); + if ("0".equals(pSid1)) { + sysSourceMenu.setMenuRootSid(sysMenu.getSid()); + } + setRootSid(sysMenu, sysSourceMenu); + } + } + + public SysMenuVo fetchByIdVo(String id) { + SysMenu entity = this.fetchById(id); + SysMenuVo vo = new SysMenuVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List listAllByRoleSid(SysMenuQuery query) { + + List sysMenuVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(), "0", query.getSourceSid()); + for (SysMenuVo s : sysMenuVos) { + getChildrensByRoleSid(s, query.getRoleSid(), query.getSourceSid()); + } + return sysMenuVos; + } + + private void getChildrensByRoleSid(SysMenuVo s, String roleSid, String sourceSid) { + String sid = s.getSid(); + List sysMenuVos = baseMapper.listAllParentByRoleSid(roleSid, sid, sourceSid); + if (!sysMenuVos.isEmpty()) { + for (SysMenuVo smv : sysMenuVos) { + getChildrensByRoleSid(smv, roleSid, sourceSid); + } + } + s.setChildren(sysMenuVos); + } + + /*public List listAllVoBySourceSId(SysMenuQuery query) { + SysSource sysSource = sysSourceService.fetchBySid(query.getSourceSid()); + List sysSourceVos = new ArrayList<>();//sysSourceService.listAllVoBySourceSId(query.getSourceSid()); + SysMenuTreeVo smtv=new SysMenuTreeVo(); + smtv.setName(sysSource.getSourceName()); + smtv.setSid(sysSource.getSid()); + smtv.setSourceSid(sysSource.getSid()); + sysSourceVos.add(smtv); + for(SysMenuTreeVo s:sysSourceVos){ + List sysMenuVoList=sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid()); + if(!sysMenuVoList.isEmpty()){ + sysMenuVoList = getChildrensForMenuTree(sysMenuVoList); + } + s.setChildren(sysMenuVoList); + } + return sysSourceVos; + }*/ + + /** + * 资源菜单树形列表 + * + * @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; + + } + + /** + * 递归把list转换成菜单树形列表 + * + * @param psid + * @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; + + } + + /** + * 构造菜单的结果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; + } + + /** + * 将该资源下的所有菜单设置为是否可用 + * + * @param sid 资源sid + * @param isEnable 是否可用：1可用，0不可用 + * @return + */ + public int updateBySourceSid(String sid, Integer isEnable) { + return baseMapper.updateBySourceSid(sid, isEnable); + } + + public void saveMenu(SysMenuDto dto) { + SysMenu entity = new SysMenu(); + dto.fillEntity(entity); + SysSourceMenu sysSourceMenu = new SysSourceMenu(); + sysSourceMenu.setMenuSid(entity.getSid()); + sysSourceMenu.setSourceSid(dto.getSourceSid()); + setRootSid(entity, sysSourceMenu); + sysSourceMenuService.save(sysSourceMenu); + save(entity); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.java new file mode 100644 index 00000000..7b9968ea --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.java @@ -0,0 +1,47 @@ +package com.yxt.supervise.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.anrui.portal.api.sysmenurole.SysMenuRole; +import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleMapper.java
+ * Class: 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); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.xml new file mode 100644 index 00000000..f9cb28ea --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleRest.java new file mode 100644 index 00000000..54656601 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleRest.java @@ -0,0 +1,115 @@ +package com.yxt.supervise.portal.biz.sysmenurole; + +import com.yxt.anrui.portal.api.sysmenurole.*; +import com.yxt.anrui.portal.api.sysrole.SysRole; +import com.yxt.supervise.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 io.swagger.annotations.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleFeignFallback.java
+ * Class: 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 implements SysMenuRoleFeign { + + @Autowired + private SysMenuRoleService sysMenuRoleService; + @Autowired + private SysRoleService sysRoleService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysMenuRoleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysMenuRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuRoleService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysMenuRoleService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysMenuRoleDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysMenuRoleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysMenuRoleDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + sysMenuRoleService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + @Override + public ResultBean updateRoleAndMenu(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不存在"); + } + } + sysMenuRoleService.delByRoleSid(roleSid); + ResultBean rb = ResultBean.fireFail(); + if(!StringUtils.isBlank(menuSid)){ + String[] sids = menuSid.split(","); + for(String sid:sids){ + SysMenuRole sysMenuRole = new SysMenuRole(); + sysMenuRole.setRoleSid(roleSid); + sysMenuRole.setMenuSid(sid); + sysMenuRoleService.save(sysMenuRole); + } + } + return rb.success(); + } + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysMenuRoleService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysMenuRoleVo vo = sysMenuRoleService.fetchByIdVo(id); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleService.java new file mode 100644 index 00000000..388f5a61 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysmenurole/SysMenuRoleService.java @@ -0,0 +1,168 @@ +package com.yxt.supervise.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.anrui.portal.api.sysmenurole.SysMenuRole; +import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto; +import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery; +import com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo; +import com.yxt.supervise.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.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: 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; + + } + ///----获平台角色s的某个资源的菜单树形列表（内存操作） 开始---- + + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.java index 70ac7efa..09476c9a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.java @@ -1,65 +1,123 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ package com.yxt.supervise.portal.biz.sysorganization; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.supervise.portal.api.sysorganization.SysOrganization; -import com.yxt.supervise.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysorganization.*; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; +import java.util.Map; /** - * Project: yxt_supervise(宇信通监管)
+ * Project: anrui_portal(门户建设)
* File: SysOrganizationMapper.java
- * Class: com.supervise.biz.sysorganization.SysOrganizationMapper
+ * Class: SysOrganizationMapper
* Description: 组织机构表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
+ * Makedate: 2021-08-03 00:24:28
* - * @author dongjianzhao + * @author liupopo * @version 1.0 * @since 1.0 */ @Mapper public interface SysOrganizationMapper extends BaseMapper { - //@Update("update sys_organization 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_organization") - List selectListVo(); + //@Update("update sys_organization 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); + + List selectFirstOrgList(); + + List selectChildrenListByPsid(@Param("psid") String psid); + + @Select("SELECT * FROM sys_organization") + List selectListVo(); + + @Select("SELECT name FROM sys_organization WHERE sid=#{sid}") + String selectOrgnameBySid(@Param("sid") String sid); + + String selectOrgSidPath(@Param("sid") String sid); + + List selectAppOrganization(); + + List selectAppOrganizationByPsid(@Param("psid") String psid); + + List treeList(String psid); + + SysOrganization selectOrgCode(); + + List getListOrg(); + + SysOrganization selectOrgCodeByPsid(); + + /** + * 根据上级sid查询组织的部门 + * + * @param psid 上级sid + * @return + */ + List selectTreeList(String psid); + + /** + * 根据部门编码查询部门信息 + * + * @param substring 部门编码 + * @return + */ + SysOrganization selectByOrgCode(String substring); + + List selectChildernList(String sid); + + /** + * 根据业务员sid获取到分公司 + * + * @param staffSid 业务员sid + * @return + */ + SysStaffOrgVo getUseOrgByUserSid(@Param("staffSid") String staffSid); + + /** + * 根据sid判断是否是分公司并获取公司名称 + * + * @param sid + * @return + */ + SysOrganizationVo getUseOrgBySid(@Param("sid")String sid); + + int updateQrCodePath(@Param("sid") String sid, @Param("path") String path); + + QrCodeVo getQrCodeVo(@Param("sid") String sid); + + @Select("select * from sys_organization WHERE staffSid=#{sid}") + SysOrganizationVo getUseOrgByStaffSid(String sid); + + List> selectUseOrgSidBySid(String psid); + + SysOrgVo getListOrgByBrand(String sid); + + List selectOrgList(String orgSid); + List selectOrgLists(String orgSid); + + List selectByOrgDeptSid(String orgDeptSid); + + SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name); + + List selectOrgSidList(); + + @Select("select * from sys_organization where orgSidPath = #{orgSidPath}") + SysOrganizationVo selectByOrgSidPath(String orgSidPath); + + List getListDeptByOrgSid(String orgSid); + + List selectOrgByPSid(String psid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.xml index 3583e0ac..214c9d13 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -1,13 +1,220 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UPDATE sys_organization + SET qrText = #{path} + WHERE sid = #{sid} + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationRest.java index ac3c3481..705e9297 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationRest.java @@ -1,95 +1,409 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ package com.yxt.supervise.portal.biz.sysorganization; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.portal.api.sysorganization.*; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.supervise.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.supervise.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.supervise.portal.biz.sysuser.SysUserService; +import com.yxt.common.base.config.RedisUtil; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.utils.QRCodeUtil; +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.supervise.portal.api.sysorganization.*; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.List; +import java.io.File; +import java.util.*; + +import static java.util.stream.Collectors.toList; /** - * Project: yxt_supervise(宇信通监管)
+ * Project: anrui_portal(门户建设)
* File: SysOrganizationFeignFallback.java
- * Class: com.supervise.biz.sysorganization.SysOrganizationRest
+ * Class: SysOrganizationRest
* Description: 组织机构表.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
+ * Makedate: 2021-08-03 00:24:28
* - * @author dongjianzhao + * @author liupopo * @version 1.0 * @since 1.0 */ @Api(tags = "组织机构表") -@RestController("com.supervise.biz.sysorganization.SysOrganizationRest") +@RestController @RequestMapping("v1/sysorganization") public class SysOrganizationRest implements SysOrganizationFeign { - @Autowired - private SysOrganizationService sysOrganizationService; - - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = sysOrganizationService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody SysOrganizationDto dto){ - ResultBean rb = ResultBean.fireFail(); - sysOrganizationService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - sysOrganizationService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - SysOrganizationDetailsVo vo = sysOrganizationService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + @Autowired + private SysOrganizationService sysOrganizationService; + @Autowired + private SysStaffOrgService sysStaffOrgService; + @Autowired + private SysStaffinfoService sysStaffinfoService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private SysUserService sysUserService; + @Autowired + private RedisUtil redisUtil; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + String psid = pq.getParams().getPsid(); + if (StringUtils.isBlank(psid)) { + ResultBean> r = new ResultBean<>(); + return r.setMessage("父级sid不能为空!"); + } + PagerVo pv = sysOrganizationService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysOrganizationQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysOrganizationService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysOrganizationService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysOrganizationDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysOrganizationService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean> selectFirstOrgList() { + return new ResultBean>().success().setData(sysOrganizationService.selectFirstOrgList()); + } + + @Override + public ResultBean> selectChildrenListBySid(String sid) { + return new ResultBean>().success().setData(sysOrganizationService.selectChildrenListBySid(sid)); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public ResultBean update(SysOrganizationDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + //查询该机构下的所有分管人员 + List stringList = sysStaffOrgService.selectByOrgSid(sid); + //根据组织sid查询组织信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); + if (sysOrganization == null) { + return rb.setMsg("该组织机构不存在"); + } + BeanUtil.copyProperties(dto, sysOrganization, "sid"); + //主管人员的sid + String zgStaffSid = dto.getZgStaffSid(); + //分管人员的sid + String fgStaffSid = dto.getFgStaffSid(); + //查询分管人员中是否包含主管人员 + if (StringUtils.isNotBlank(fgStaffSid)) { + if (StringUtils.isNotBlank(zgStaffSid)) { + if (fgStaffSid.contains(zgStaffSid)) { + return rb.setMsg("同一个组织机构中主管分管的人员不能重复"); + } + } + } + //删除关联关系中的所有主管与分管的人员关系 + sysStaffOrgService.delZGAndFGByOrgSid(sid); + /*if (StringUtils.isNotBlank(zgStaffSid)) { + ResultBean resultBean = sysOrganizationService.addSysStaffOrg(zgStaffSid, "1", sysOrganization); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + }*/ + if (StringUtils.isNotBlank(fgStaffSid)) { + ResultBean resultBean = sysOrganizationService.addSysStaffOrg(fgStaffSid, "2", sysOrganization); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + } + sysOrganizationService.updateBySid(dto.toMap(), sid); + //修改金蝶组织信息 + //==========================添加清空变化的用户的token + //查询分管人员 + List stringList1 = new ArrayList<>(); + List reduce1 = new ArrayList<>(); + if(StringUtils.isNotBlank(fgStaffSid)){ + stringList1 = Arrays.asList(fgStaffSid.split(",")); + reduce1 = stringList1.stream().filter(item -> !stringList.contains(item)).collect(toList()); + }else{ + reduce1 = stringList; + } + String orgSid1 = sysStaffOrgService.getOrgByOrgSid(sid); + if(reduce1.size()>0){ + for (String s : reduce1){ + //查询该人员的组织机构list + List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(s); + List orgList = new ArrayList<>(); + if (sysStaffOrgVos.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos) { + String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization ss = sysOrganizationService.fetchBySid(orgSid); + if (ss != null) { + orgList.add(orgSid); + } else { + continue; + } + } + } + if(!orgList.contains(orgSid1)){ + //根据staffSid查询token + String token = sysUserService.selectByStaffsid(s).getToken(); + if(StringUtils.isNotBlank(token)){ + //清空该token + redisUtil.remove(token); + } + } + } + + } + return rb.success(); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysOrganizationService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean delBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(sid)) { + return ResultBean.fireFail().setMessage("sid不能为空!"); + } + String[] sidArr = sid.split(","); + sysOrganizationService.delBySids(sidArr); + return rb.success(); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo vo = sysOrganizationService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysOrganization entity = sysOrganizationService.fetchBySid(sid); + List list = sysStaffOrgService.fetchByOrgSid(sid); + String fgNames = ""; + String fgSids = ""; + String zgNames = ""; + String zgSids = ""; + for (SysStaffOrgVo s : list) { + if ("1".equals(s.getManageType())) { + zgNames = zgNames + "," + s.getStaffName(); + zgSids = zgSids + "," + s.getStaffSid(); + } + if ("2".equals(s.getManageType())) { + fgNames = fgNames + "," + s.getStaffName(); + fgSids = fgSids + "," + s.getStaffSid(); + } + } + if (fgNames.length() > 1) { + fgNames = fgNames.substring(1, fgNames.length()); + fgSids = fgSids.substring(1, fgSids.length()); + } + if (zgNames.length() > 1) { + zgNames = zgNames.substring(1, zgNames.length()); + zgSids = zgSids.substring(1, zgSids.length()); + } + SysOrganizationVo vo = new SysOrganizationVo(); + BeanUtil.copyProperties(entity, vo); + vo.setFgNames(fgNames); + vo.setFgStaffSid(fgSids); + vo.setZgNames(zgNames); + vo.setZgStaffSid(zgSids); + return rb.success().setData(vo); + } + + @Override + public ResultBean> selectAppOrganization(String sid) { + Map map = new HashMap<>(); + List> nameList = sysOrganizationService.selectOrgNameList(sid); + List staffList = new ArrayList<>(); + List list = null; + if (StringUtils.isBlank(sid)) { // 组织架构 + list = sysOrganizationService.selectAppOrganization(); + } else { // 组织架构子集 + list = sysOrganizationService.selectAppOrganizationSub(sid); + staffList = sysStaffinfoService.selectContactsByOrgsid(sid); + list.addAll(staffList); + } + map.put("nameList", nameList); + map.put("list", list); +// map.put("staffList", staffList); + return new ResultBean>().success().setData(map); + } + + @Override + public ResultBean> selectListOrg() { + ResultBean> rb = ResultBean.fireFail(); + List menuTree2VoList = sysOrganizationService.treeList(); + return rb.success().setData(menuTree2VoList); + } + + @Override + public ResultBean> getListOrg() { + ResultBean> rb = ResultBean.fireFail(); + List menuTree2VoList = sysOrganizationService.getListOrg(); + return rb.success().setData(menuTree2VoList); + } + + @Override + public ResultBean> getListOrgByBrand(String orgSid) { + return null;//sysOrganizationService.getListOrgByBrand(orgSid); + } + + @Override + public ResultBean> getListOrgByBrandSid(String orgSid, String brandSid) { + return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid); + } + + @Override + public ResultBean> getListOrgByBrandSidNo(String orgSid, String brandSid) { + return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid); + } + + @Override + public ResultBean> getListDeptByOrgSid(String orgSid) { + return sysOrganizationService.getListDeptByOrgSid(orgSid); + } + + @Override + public ResultBean getUseOrgByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid); + return rb.success().setData(vo); + } + + @Override + public ResultBean selectBySid(String sid) { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); + if (sysOrganization == null) { + return new ResultBean().fail().setData(new SysOrganization()); + } + return new ResultBean().success().setData(sysOrganization); + } + + @Override + public ResultBean>> selectUseOrgSidBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + List> maps = sysOrganizationService.selectUseOrgSidBySid(sid); + return rb.success().setData(maps); + } + + /** + * 查询公司所有的部门 + * + * @return + */ + @Override + public ResultBean> selectListOne() { + ResultBean> rb = ResultBean.fireFail(); + List sysOrgListVo = sysOrganizationService.selectTreeList(); + if (sysOrgListVo.size() == 0) { + List list = new ArrayList(); + list.add(new SysOrgListVo()); + return rb.setData(list); + } + return rb.success().setData(sysOrgListVo); + } + + @Override + public ResultBean getQrCode(String sid) { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); + if (sysOrganization == null) { + return new ResultBean().fail().setMsg("部门不存在"); + } + if (StringUtils.isBlank(sysOrganization.getQrText())) { + File file = new File(fileUploadComponent.getUploadPath() + "qrCode"); + QRCodeUtil.createCodeToFile(sysOrganization.getSid() + "#" + sysOrganization.getId() + "#" + "q", file, sysOrganization.getName() + sysOrganization.getId() + ".png"); + //将该二维码地址放进部门表中的二维码图片地址中 + String path = fileUploadComponent.getUrlPrefix() + "qrCode/" + sysOrganization.getName() + sysOrganization.getId() + ".png"; + sysOrganizationService.updateQrCodePath(sid, path); + } + QrCodeVo qrCodeVo = sysOrganizationService.getQrCodeVo(sid); + String orgSidPath = sysOrganization.getOrgSidPath(); + String[] split = orgSidPath.split("/"); + for (String s : split) { + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(s); + Integer isDept = sysOrganization1.getIsDept(); + String psid = sysOrganization1.getPsid(); + if (isDept != null) { + if (isDept == 0 && !psid.equals(0)) { + qrCodeVo.setOrganizationName(sysOrganization1.getName()); + break; + } + } + } + return new ResultBean().success().setData(qrCodeVo); + } + + @Override + public ResultBean getOrgSid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(sid); + if (sysOrganization == null) { + return rb.setMsg("该组织不存在"); + } + String orgSid = sysOrganizationService.getOrgSid(sid); + return rb.success().setData(orgSid); + } + + @Override + public ResultBean> selectOrgList(SysOrganizationListQuery query) { + return sysOrganizationService.selectOrgList(query); + } + + @Override + public ResultBean> selectOrgLists(SysOrganizationListQuery query) { + return sysOrganizationService.selectOrgLists(query); + } + + @Override + public ResultBean selectByPSid(String sid, String name) { + return sysOrganizationService.selectByPSid(sid,name); + } + + @Override + public ResultBean> selectOrgSidList() { + ResultBean> rb = ResultBean.fireFail(); + List stringList = sysOrganizationService.selectOrgSidList(); + return rb.success().setData(stringList); + } + + @Override + public ResultBean> selectOrgByPSid(String psid) { + return sysOrganizationService.selectOrgByPSid(psid); + } + + @Override + public ResultBean selectByOrgSidPath(String orgSidPath) { + return sysOrganizationService.selectByOrgSidPath(orgSidPath); + } } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationService.java index e8991ba5..40493909 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysorganization/SysOrganizationService.java @@ -1,105 +1,504 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ package com.yxt.supervise.portal.biz.sysorganization; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.supervise.portal.api.sysorganization.*; -import org.apache.commons.lang3.StringUtils; +import com.yxt.anrui.portal.api.sysorganization.*; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.supervise.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.supervise.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.supervise.portal.biz.sysuser.SysUserService; +import com.yxt.common.base.config.RedisUtil; +import com.yxt.common.base.config.component.FileUploadComponent; 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 org.springframework.transaction.annotation.Transactional; + +import java.util.*; -import java.util.List; +import static java.util.stream.Collectors.toList; /** - * Project: yxt_supervise(宇信通监管)
+ * Project: anrui_portal(门户建设)
* File: SysOrganizationService.java
- * Class: com.supervise.biz.sysorganization.SysOrganizationService
+ * Class: SysOrganizationService
* Description: 组织机构表 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:30
+ * Makedate: 2021-08-03 00:24:28
* - * @author dongjianzhao + * @author liupopo * @version 1.0 * @since 1.0 */ @Service public class SysOrganizationService extends MybatisBaseService { - private QueryWrapper createQueryWrapper(SysOrganizationQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - SysOrganizationQuery 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 void saveOrUpdateDto(SysOrganizationDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(SysOrganizationDto dto){ - SysOrganization entity = new SysOrganization(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(SysOrganizationDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - SysOrganization entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public SysOrganizationDetailsVo fetchDetailsVoBySid(String sid){ - SysOrganization entity = fetchBySid(sid); - SysOrganizationDetailsVo vo = new SysOrganizationDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } + @Autowired + private SysStaffOrgService sysStaffOrgService; + @Autowired + private SysUserService sysUserService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private SysStaffinfoService sysStaffInfoService; + @Autowired + private RedisUtil redisUtil; + + public PagerVo listPage(PagerQuery pq) { + SysOrganizationQuery 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(SysOrganizationQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysOrganizationQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.eq("name", query.getName()); + } + + if (StringUtils.isNotBlank(query.getPsid())) { + qw.eq("psid", query.getPsid()); + } + + if (StringUtils.isNotBlank(query.getLinkPhone())) { + qw.eq("linkPhone", query.getLinkPhone()); + } + + if (StringUtils.isNotBlank(query.getOrgSidPath())) { + qw.eq("orgSidPath", query.getOrgSidPath()); + } + + if (query.getSort() != null) { + qw.eq("sort", query.getSort()); + } + + if (StringUtils.isNotBlank(query.getAddrs())) { + qw.eq("addrs", query.getAddrs()); + } + + if (StringUtils.isNotBlank(query.getJwd())) { + qw.eq("jwd", query.getJwd()); + } + + if (StringUtils.isNotBlank(query.getQrText())) { + qw.eq("qrText", query.getQrText()); + } + + if (query.getLimitOrgMember() != null) { + qw.eq("limitOrgMember", query.getLimitOrgMember()); + } + + if (StringUtils.isNotBlank(query.getOrgCode())) { + qw.eq("orgCode", query.getOrgCode()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysOrganizationQuery 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(SysOrganizationQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + List sysOrganizations = baseMapper.selectFirstOrgList(); + getChildList(sysOrganizations); + return sysOrganizations; + } + + + public void getChildList(List list) { + list.forEach(str -> { + String sid = str.getSid(); + List listChildren = baseMapper.selectChildernList(sid); + str.setChildren(listChildren); + getChildList(listChildren); + }); + } + + public List selectFirstOrgList() { + return baseMapper.selectFirstOrgList(); + } + + public List selectChildrenListBySid(String sid) { + return baseMapper.selectChildrenListByPsid(sid); + } + + @Transactional(rollbackFor = Exception.class) + public ResultBean addSysStaffOrg(String sids, String manageType, SysOrganization entity) { + ResultBean rb = ResultBean.fireFail(); + String[] sidArr = sids.split(","); + String name = ""; + for (String sid : sidArr) { + //查询组织关系中是否已经包含分管的人员 + if ("1".equals(manageType)) { + //查询是否有员工信息，如果有的话，删除关联关系 + sysStaffOrgService.deleteByStaffSidAndType(entity.getOrgSidPath(), sid, "3"); + } else { + int count = sysStaffOrgService.selectByStaffAndOrg(entity.getOrgSidPath(), sid, "3"); + SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(sid); + if (count > 0) { + return rb.setMsg(sysStaffinfo.getName() + "已在本部门，不能设置分管"); + } + + } + //查询该人员的组织机构list + List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid); + List orgList = new ArrayList<>(); + if (sysStaffOrgVos.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos) { + String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization sysOrganization = fetchBySid(orgSid); + if (sysOrganization != null) { + orgList.add(orgSid); + } else { + continue; + } + } + } + //添加员工与组织的关联关系 + SysStaffOrg sysStaffOrg = new SysStaffOrg(); + sysStaffOrg.setManageType(manageType); + sysStaffOrg.setOrgSid(entity.getSid()); + sysStaffOrg.setOrgName(entity.getName()); + sysStaffOrg.setStaffSid(sid); + String orgSidPath = entity.getOrgSidPath(); + if (StringUtils.isNotBlank(orgSidPath)) { + sysStaffOrg.setOrgSidPath(orgSidPath); + } else { + sysStaffOrg.setOrgSidPath(entity.getSid()); + } + String psid = entity.getPsid(); + if (StringUtils.isNotBlank(psid)) { + SysOrganization sysOrganization = this.fetchBySid(psid); + if (sysOrganization != null) { + sysStaffOrg.setOrgNamePath(sysOrganization.getName() + "/" + entity.getName()); + } else { + sysStaffOrg.setOrgNamePath(entity.getName()); + } + } + sysStaffOrgService.save(sysStaffOrg); + //==========================添加清空变化的用户的token + List sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid); + List orgList1 = new ArrayList<>(); + if (sysStaffOrgVos1.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos1) { + String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization sysOrganization = fetchBySid(orgSid); + if (sysOrganization != null) { + orgList1.add(orgSid); + } else { + continue; + } + } + } + List reduce1 = orgList1.stream().filter(item -> !orgList.contains(item)).collect(toList()); + if (reduce1.size() > 0) { + //根据staffSid查询token + String token = sysUserService.selectByStaffsid(sid).getToken(); + if (StringUtils.isNotBlank(token)) { + //清空该token + redisUtil.remove(token); + } + } + + + } + + return rb.success(); + } + + public void saveOrUpdateDto(SysOrganizationDto dto) { + SysOrganization entity = new SysOrganization(); + dto.fillEntity(entity); + //主管人员sid + String zgStaffSid = dto.getZgStaffSid(); + //分管人员sid + String fgStaffSid = dto.getFgStaffSid(); + String psid = dto.getPsid(); + SysOrganization sysOrganization = this.fetchBySid(psid); + + if (StringUtils.isNotBlank(zgStaffSid)) { + this.addSysStaffOrg(zgStaffSid, "1", entity); + } + if (StringUtils.isNotBlank(fgStaffSid)) { + this.addSysStaffOrg(fgStaffSid, "2", entity); + } + entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid()); + this.saveOrUpdate(entity); + } + + public SysOrganizationVo fetchByIdVo(String id) { + SysOrganization entity = this.fetchById(id); + SysOrganizationVo vo = new SysOrganizationVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public String selectOrgnameBySid(String sid) { + return baseMapper.selectOrgnameBySid(sid); + } + + public List> selectOrgNameList(String sid) { + String orgSidPath = baseMapper.selectOrgSidPath(sid); + String[] orgSidPathArr = orgSidPath.split("/"); + List> nameList = new ArrayList<>(); + for (int i = 0; i < orgSidPathArr.length; i++) { + Map m = new HashMap<>(); + m.put("sid", orgSidPathArr[i]); + m.put("name", selectOrgnameBySid(orgSidPathArr[i])); + nameList.add(m); + } + return nameList; + } + + public List selectAppOrganization() { + List list = baseMapper.selectAppOrganization(); + list.stream().forEach(vo -> { + if (StringUtils.isNotBlank(vo.getHeadImage())) { + vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage()); + } + }); + return list; + } + + public List selectAppOrganizationSub(String psid) { + List list = baseMapper.selectAppOrganizationByPsid(psid); + list.stream().forEach(vo -> { + if (StringUtils.isNotBlank(vo.getHeadImage())) { + vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage()); + } + }); + return list; + } + + /** + * @param + * @description: 获取组织架构即使用组织下拉框 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/12 21:47 + */ + public List treeList() { + String psid = "0"; + List list = baseMapper.treeList(psid); + getChildOrgList(list); + return list; + } + + public void getChildOrgList(List list) { + list.forEach(menuTree -> { + String sid = menuTree.getSid(); + List listChildren = baseMapper.treeList(sid); + menuTree.setChildren(listChildren); + if (Arrays.asList(menuTree.getOrgSidPath().split("/")).size() <= 2) { + getChildOrgList(listChildren); + } + + }); + } + + /** + * @param + * @description: 查询部门编码 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/18 15:49 + */ + public SysOrganization selectOrgCode() { + return baseMapper.selectOrgCode(); + } + + public List getListOrg() { + List list = baseMapper.getListOrg(); + return list; + } + + public SysOrganization selectOrgCodeByPsid() { + return baseMapper.selectOrgCodeByPsid(); + } + + /** + * 查询所有部门列表 + * + * @return + */ + public List selectTreeList() { + String psid = "0"; + List list = baseMapper.selectTreeList(psid); + getChildOrgListOne(list); + return list; + + } + + /** + * 查询组织子集 + * + * @param list + */ + public void getChildOrgListOne(List list) { + list.forEach(menuTree -> { + String sid = menuTree.getSid(); + List listChildren = baseMapper.treeList(sid); + menuTree.setChildren(listChildren); + }); + } + + /** + * 根据部门编码查询部门信息 + * + * @param substring 部门编码 + * @return + */ + public SysOrganization selectByOrgCode(String substring) { + return baseMapper.selectByOrgCode(substring); + } + + /** + * 根据业务员sid获取到分公司 + * + * @param userSid 业务员sid + * @return + */ + public SysOrganizationVo getUseOrgByUserSid(String userSid) { + String staffSid = sysUserService.getUserOrgInfoByUserSid(userSid).getStaffSid(); + SysStaffOrgVo sysOrgVo = baseMapper.getUseOrgByUserSid(staffSid); + String orgSidPath = sysOrgVo.getOrgSidPath(); + SysOrganizationVo vo = getUseOrgBySid(orgSidPath); + return vo; + } + + /** + * 根据sid判断是否是分公司并获取公司名称 + * + * @param orgSidPath + * @return + */ + public SysOrganizationVo getUseOrgBySid(String orgSidPath) { + String[] split = orgSidPath.split("/"); + for (int i = 0; i < split.length; i++) { + SysOrganizationVo sysOrganizationVo = baseMapper.getUseOrgBySid(split[i]); + if (sysOrganizationVo != null) { + return sysOrganizationVo; + } + } + SysOrganization sysOrganization = fetchBySid(split[0]);// 总公司为所在公司 + SysOrganizationVo sysOrganizationVo = new SysOrganizationVo(); + BeanUtil.copyProperties(sysOrganization, sysOrganizationVo); + return sysOrganizationVo; + } + + public int updateQrCodePath(String sid, String path) { + return baseMapper.updateQrCodePath(sid, path); + } + + public QrCodeVo getQrCodeVo(String sid) { + return baseMapper.getQrCodeVo(sid); + } + + public List> selectUseOrgSidBySid(String sid) { + SysOrganization sysOrganization = fetchBySid(sid); + String psid = sysOrganization.getPsid(); + return baseMapper.selectUseOrgSidBySid(psid); + } + + public String getOrgSid(String sid) { + SysOrganization sysOrganization = fetchBySid(sid); + String orgSid = ""; + if ("0".equals(sysOrganization.getPsid())) {//总公司 + orgSid = sysOrganization.getSid(); + return orgSid; + } + if (sysOrganization.getIsDept() == 0) {//是独立法人的 + return sysOrganization.getSid(); + } + sid = sysOrganization.getPsid(); + return getOrgSid(sid); + } + + public ResultBean> selectOrgList(SysOrganizationListQuery query) { + ResultBean> rb = ResultBean.fireFail(); + //根据用户sid查询分公司sid + String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid()); + String orgSid = getOrgSid(orgDeptSid); + //根据分公司名称查询销售部门的部门 + List sysOrganizationListVos = baseMapper.selectOrgList(orgSid); + sysOrganizationListVos.removeAll(Collections.singleton(null)); + if (!sysOrganizationListVos.isEmpty()) { + for (SysOrganizationListVo vo : sysOrganizationListVos) { + orgDeptSid = vo.getOrgDeptSid(); + List sysOrgStaffVoList = baseMapper.selectByOrgDeptSid(orgDeptSid); + vo.setStaffinfoVoList(sysOrgStaffVoList); + } + } + return rb.success().setData(sysOrganizationListVos); + } + + public ResultBean> selectOrgLists(SysOrganizationListQuery query) { + ResultBean> rb = ResultBean.fireFail(); + //根据用户sid查询分公司sid + String orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid()); + String orgSid = getOrgSid(orgDeptSid); + //根据分公司名称查询销售部门的部门 + List sysOrganizationListVos = baseMapper.selectOrgLists(orgSid); + sysOrganizationListVos.removeAll(Collections.singleton(null)); + return rb.success().setData(sysOrganizationListVos); + + } + + public ResultBean selectByPSid(String sid, String name) { + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo vo = baseMapper.selectByPSid(sid, name); + return rb.success().setData(vo); + } + + public List selectOrgSidList() { + return baseMapper.selectOrgSidList(); + } + + public ResultBean selectByOrgSidPath(String orgSidPath) { + ResultBean rb = ResultBean.fireFail(); + SysOrganizationVo sysOrganizationVo = baseMapper.selectByOrgSidPath(orgSidPath); + return rb.success().setData(sysOrganizationVo); + } + + public ResultBean> getListDeptByOrgSid(String orgSid) { + ResultBean> rb = ResultBean.fireFail(); + List sysOrgVos = baseMapper.getListDeptByOrgSid(orgSid); + return rb.success().setData(sysOrgVos); + } + + public ResultBean> selectOrgByPSid(String psid) { + ResultBean rb = ResultBean.fireFail(); + List sysOrganizationVos = baseMapper.selectOrgByPSid(psid); + return rb.success().setData(sysOrganizationVos); + } } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.java new file mode 100644 index 00000000..eb801731 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.java @@ -0,0 +1,68 @@ +package com.yxt.supervise.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.anrui.portal.api.syspost.SysPost; +import com.yxt.anrui.portal.api.syspost.SysPostListVo; +import com.yxt.anrui.portal.api.syspost.SysPostVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostMapper.java
+ * Class: SysPostMapper
+ * 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 SysPostMapper extends BaseMapper { + + //@Update("update sys_post 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_post") + List selectListVo(); + + @Select("select * from sys_post where sid=#{sid} ") + SysPost fetchBySid(@Param("sid") String sid); + + @Select("select * from sys_post where orgSid=#{orgSid} ") + List fetchByOrgSid(@Param("orgSid") String orgSid); + + @Select("select postCode,`name` from sys_post") + List fetchByOrgSidPostCode(); + + /** + * 查询所有岗位列表 + * + * @return + */ + List selectListOne(); + + /** + * 根据岗位编码查询岗位信息 + * + * @param substring 岗位编码 + * @return + */ + SysPost selectByPostCode(String substring); + + @Select("select * from sys_post where staffSid = #{sid}") + SysPost getPostByStaffSid(String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.xml new file mode 100644 index 00000000..d4a50e81 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostMapper.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostRest.java new file mode 100644 index 00000000..d998c984 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostRest.java @@ -0,0 +1,131 @@ +package com.yxt.supervise.portal.biz.syspost; + +import com.yxt.anrui.portal.api.syspost.*; +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.Api; +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 java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostFeignFallback.java
+ * Class: SysPostRest
+ * 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/syspost") +public class SysPostRest implements SysPostFeign { + + @Autowired + private SysPostService sysPostService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysPostService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysPostQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysPostService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysPostService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysPostDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysPostService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysPostDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + sysPostService.updateBySid(dto.toMap(), sid); + return rb.success(); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysPostService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean delBySids(String sids) { + ResultBean rb = ResultBean.fireFail(); + String[] sidArr = sids.split(","); + sysPostService.delBySids(sidArr); + return rb.success(); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysPostVo vo = sysPostService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysPostVo vo = sysPostService.fetchBySidVo(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> fetchByOrgSid(String orgSid) { + ResultBean rb = ResultBean.fireFail(); + List list = sysPostService.fetchByOrgSid(orgSid); + return rb.success().setData(list); + } + + @Override + public ResultBean fetchByOrgSidPostCode() { + ResultBean rb = ResultBean.fireFail(); + String s = sysPostService.fetchByOrgSidPostCode(); + return rb.success().setData(s); + } + + /** + * 查询所有岗位 + * + * @return + */ + @Override + public ResultBean> selectList() { + ResultBean> rb = ResultBean.fireFail(); + List sysPostVoList = sysPostService.selectList(); + if (sysPostVoList.size() == 0) { + List list = new ArrayList<>(); + list.add(new SysPostListVo()); + return rb.setData(list); + } + return rb.success().setData(sysPostVoList); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostService.java new file mode 100644 index 00000000..f896c58a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syspost/SysPostService.java @@ -0,0 +1,144 @@ +package com.yxt.supervise.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.anrui.portal.api.sysorganization.SysOrganization; +import com.yxt.anrui.portal.api.syspost.*; +import com.yxt.supervise.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 org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysPostService.java
+ * Class: SysPostService
+ * 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 SysPostService extends MybatisBaseService { + + @Autowired + private SysOrganizationService sysOrganizationService; + + public PagerVo listPage(PagerQuery pq) { + SysPostQuery 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(SysPostQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysPostQuery query) { + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.like("post.name", query.getName()); + } + + if (StringUtils.isNotBlank(query.getOrgSid())) { + qw.eq("post.orgSid", query.getOrgSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysPostQuery 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(SysPostQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysPostDto dto) { + SysPost entity = new SysPost(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysPostVo fetchByIdVo(String id) { + SysPost entity = this.fetchById(id); + SysPostVo vo = new SysPostVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public SysPostVo fetchBySidVo(String sid) { + SysPost entity = baseMapper.fetchBySid(sid); + SysPostVo vo = new SysPostVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List fetchByOrgSid(String orgSid) { + return baseMapper.fetchByOrgSid(orgSid); + } + + public String fetchByOrgSidPostCode() { + List sysPostVoList = baseMapper.fetchByOrgSidPostCode(); + String pCode = ""; + for (SysPostVo sysPostVo : sysPostVoList) { + SysOrganization sysOrganizations = sysOrganizationService.selectOrgCodeByPsid(); + String orgCode = sysOrganizations.getOrgCode(); + String postCode = sysPostVo.getPostCode(); + pCode = orgCode + postCode; + } + return pCode; + } + + /** + * 查询所有岗位列表 + * + * @return + */ + public List selectList() { + List list = baseMapper.selectListOne(); + return list; + } + + /** + * 根据岗位编码查询岗位信息 + * + * @param substring 岗位编码 + * @return + */ + public SysPost selectByPostCode(String substring) { + return baseMapper.selectByPostCode(substring); + } + + public SysPost getPostByStaffSid(String sid) { + return baseMapper.getPostByStaffSid(sid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.java new file mode 100644 index 00000000..3fb8b36b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.java @@ -0,0 +1,62 @@ +package com.yxt.supervise.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.anrui.portal.api.sysrole.SysRole; +import com.yxt.anrui.portal.api.sysrole.SysRoleVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleMapper.java
+ * Class: SysRoleMapper
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysRoleMapper extends BaseMapper { + + //@Update("update sys_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_role") + List selectListVo(); + + List fetchByUserSid(String userSid); + + List listAllByUserSid(String userSid); + + SysRole fetchByName(String name); + + int deleteBatchSids(List list); + + int deleteBySid(String valueOf); + + SysRoleVo fetchBySid(String sid); + + int updateIsEnable(@Param("sid") String sid, @Param("isEnable") String isEnable); + + String getLevelType(String roleSid); + + String selectRoleSid(String userRoleSid); + + String selectByUserSid(String sid); + + List selectByUser(String userSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.xml new file mode 100644 index 00000000..c9bf1b6a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleMapper.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + DELETE + FROM sys_role WHERE sid IN + + #{sid} + + + + DELETE + FROM sys_role + WHERE sid = #{sid} + + + + UPDATE sys_role + SET isEnable = #{isEnable} + WHERE sid = #{sid} + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleRest.java new file mode 100644 index 00000000..730e2647 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleRest.java @@ -0,0 +1,153 @@ +package com.yxt.supervise.portal.biz.sysrole; + +import com.yxt.anrui.portal.api.sysrole.*; +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 io.swagger.annotations.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: SysRoleRest
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色") +@RestController +@RequestMapping("v1/sysrole") +public class SysRoleRest implements SysRoleFeign { + + @Autowired + private SysRoleService sysRoleService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysRoleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysRoleService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> listAllByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + List list = sysRoleService.listAllByUserSid(userSid); + return rb.success().setData(list); + } + + @Override + public ResultBean> fetchByUserSid(String userSid) { + if(StringUtils.isBlank(userSid)){ + return new ResultBean>().fail().setMsg("userSid不能为空"); + } + ResultBean rb = ResultBean.fireFail(); + List list = sysRoleService.fetchByUserSid(userSid); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysRoleService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysRoleDto dto){ + String name = dto.getName(); + if(StringUtils.isBlank(name)){ + return new ResultBean>().fail().setMsg("角色名称不能为空!"); + }else{ + SysRoleVo sysRoleVo = sysRoleService.fetchByName(name); + if(sysRoleVo.getName()!=null){ + return new ResultBean>().fail().setMsg("角色名称不能重复!"); + } + } + ResultBean rb = ResultBean.fireFail(); + sysRoleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysRoleDto dto,String sid){ + String roleName = dto.getName(); + if(StringUtils.isBlank(sid)){ + return new ResultBean>().fail().setMsg("角色sid不能为空!"); + } + if(StringUtils.isBlank(roleName)){ + return new ResultBean>().fail().setMsg("角色名称不能为空!"); + }else{ + SysRoleVo sysRoleVo = sysRoleService.fetchByName(roleName); + if(sysRoleVo.getName()!=null&&!sid.equals(sysRoleVo.getSid())){ + return new ResultBean>().fail().setMsg("角色名称不能重复!"); + } + } + ResultBean rb = ResultBean.fireFail(); + sysRoleService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysRoleService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean delBySids(String sids) { + ResultBean rb = ResultBean.fireFail(); + sysRoleService.delBySids(sids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysRoleVo vo = sysRoleService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysRoleVo vo = sysRoleService.fetchBySidVo(sid); + if (StringUtils.isBlank(vo.getSid())) { + return rb.success().setData(null); + } + return rb.success().setData(vo); + } + + @Override + public ResultBean setIsEnable(String sid, String isEnable) { + SysRole role = sysRoleService.fetchBySid(sid); + if (role == null) { + return ResultBean.fireFail().setMsg("此角色已不存在"); + } + int i = sysRoleService.updateIsEnable(sid, isEnable); + if (i == 0) { + return ResultBean.fireFail().setMsg("设置失败"); + } + return ResultBean.fireSuccess().setMsg("设置成功"); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleService.java new file mode 100644 index 00000000..fc3ae6f4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrole/SysRoleService.java @@ -0,0 +1,165 @@ +package com.yxt.supervise.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.anrui.portal.api.sysrole.SysRole; +import com.yxt.anrui.portal.api.sysrole.SysRoleDto; +import com.yxt.anrui.portal.api.sysrole.SysRoleQuery; +import com.yxt.anrui.portal.api.sysrole.SysRoleVo; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleService.java
+ * Class: SysRoleService
+ * Description: 角色 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysRoleService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SysRoleQuery 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(SysRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysRoleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getName())) { + qw.like("sr.name", query.getName()); + } + + if (query.getSort() != null) { + qw.eq("sr.sort", query.getSort()); + } + + if (StringUtils.isNotBlank(query.getCode())) { + qw.eq("sr.code", query.getCode()); + } + + if (query.getType() != null) { + qw.eq("sr.type", query.getType()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysRoleQuery 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(SysRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysRoleDto dto) { + SysRole entity = new SysRole(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysRoleVo fetchByIdVo(String id) { + SysRole entity = this.fetchById(id); + SysRoleVo vo = new SysRoleVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List fetchByUserSid(String userSid) { + return baseMapper.fetchByUserSid(userSid); + } + + public List listAllByUserSid(String userSid) { + return baseMapper.listAllByUserSid(userSid); + } + + public SysRoleVo fetchByName(String name) { + SysRole entity = baseMapper.fetchByName(name); + SysRoleVo vo = new SysRoleVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 描述 : <描述函数实现的功能>.
+ *

+ * + * @param sids + * @return + */ + public int delBySids(String sids) { + String[] split = sids.split(","); + if (split.length < 1) { + return 0; + } else if (split.length == 1) { + return baseMapper.deleteBySid(sids); + } else { + List list = new ArrayList<>(); + for (String sid : split) { + list.add(sid); + } + return baseMapper.deleteBatchSids(list); + } + } + + public SysRoleVo fetchBySidVo(String sid) { + SysRoleVo vo = baseMapper.fetchBySid(sid); + return vo; + } + + public int updateIsEnable(String sid, String isEnable) { + return baseMapper.updateIsEnable(sid, isEnable); + } + + public String getLevelType(String roleSid) { + return baseMapper.getLevelType(roleSid); + } + + public String selectRoleSid(String userRoleSid) { + return baseMapper.selectRoleSid(userRoleSid); + } + + public String selectByUserSid(String sid) { + return baseMapper.selectByUserSid(sid); + } + + public List selectByUser(String userSid) { + return baseMapper.selectByUser(userSid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.java new file mode 100644 index 00000000..39804042 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.java @@ -0,0 +1,43 @@ +package com.yxt.supervise.portal.biz.sysrolefunction; + +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.anrui.portal.api.sysrolefunction.SysRoleFunction; +import com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionMapper.java
+ * Class: SysRoleFunctionMapper
+ * Description: 角色与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysRoleFunctionMapper extends BaseMapper { + + //@Update("update sys_role_function 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_role_function") + List selectListVo(); + @Delete("delete from sys_source_role where roleSid=#{roleSid} ") + void deleteByRoleSid(@Param("roleSid") String roleSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.xml new file mode 100644 index 00000000..969403b7 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionRest.java new file mode 100644 index 00000000..8abdff65 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionRest.java @@ -0,0 +1,114 @@ +package com.yxt.supervise.portal.biz.sysrolefunction; + +import com.yxt.anrui.portal.api.sysrole.SysRole; +import com.yxt.anrui.portal.api.sysrolefunction.*; +import com.yxt.supervise.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 io.swagger.annotations.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionFeignFallback.java
+ * Class: SysRoleFunctionRest
+ * Description: 角色与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色与功能关联表") +@RestController +@RequestMapping("v1/sysrolefunction") +public class SysRoleFunctionRest implements SysRoleFunctionFeign { + + @Autowired + private SysRoleFunctionService sysRoleFunctionService; + @Autowired + private SysRoleService sysRoleService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysRoleFunctionService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysRoleFunctionQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysRoleFunctionService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysRoleFunctionService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysRoleFunctionDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysRoleFunctionService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysRoleFunctionDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + sysRoleFunctionService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + @Override + public ResultBean updateRoleAndFunction(SysRoleFunctionDto dto) { + String roleSid = dto.getRoleSid(); + String functionSids = dto.getFunctionSid(); + 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不存在"); + } + } + sysRoleFunctionService.deleteByRoleSid(roleSid); + if(!StringUtils.isBlank(functionSids)){ + String[] sids = functionSids.split(","); + for(String sid:sids){ + SysRoleFunction sysRoleFunction = new SysRoleFunction(); + sysRoleFunction.setRoleSid(roleSid); + sysRoleFunction.setFunctionSid(sid); + sysRoleFunctionService.save(sysRoleFunction); + } + } + ResultBean rb = ResultBean.fireFail(); + return rb.success(); + } + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysRoleFunctionService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysRoleFunctionVo vo = sysRoleFunctionService.fetchByIdVo(id); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionService.java new file mode 100644 index 00000000..cf551d18 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysrolefunction/SysRoleFunctionService.java @@ -0,0 +1,96 @@ +package com.yxt.supervise.portal.biz.sysrolefunction; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunction; +import com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionDto; +import com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionQuery; +import com.yxt.anrui.portal.api.sysrolefunction.SysRoleFunctionVo; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFunctionService.java
+ * Class: SysRoleFunctionService
+ * Description: 角色与功能关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysRoleFunctionService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SysRoleFunctionQuery 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(SysRoleFunctionQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysRoleFunctionQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getRoleSid())) { + qw.eq("roleSid", query.getRoleSid()); + } + + if (StringUtils.isNotBlank(query.getFunctionSid())) { + qw.eq("functionSid", query.getFunctionSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysRoleFunctionQuery 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(SysRoleFunctionQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysRoleFunctionDto dto){ + SysRoleFunction entity = new SysRoleFunction(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysRoleFunctionVo fetchByIdVo(String id){ + SysRoleFunction entity = this.fetchById(id); + SysRoleFunctionVo vo = new SysRoleFunctionVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByRoleSid(String roleSid) { + baseMapper.deleteByRoleSid(roleSid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.java new file mode 100644 index 00000000..2fdf1c3c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.java @@ -0,0 +1,56 @@ +package com.yxt.supervise.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.anrui.portal.api.sysfunction.SysFunctionTreeVo; +import com.yxt.anrui.portal.api.sysmenu.SysMenuTreeVo; +import com.yxt.anrui.portal.api.syssource.SysSource; +import com.yxt.anrui.portal.api.syssource.SysSourceVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceMapper.java
+ * Class: SysSourceMapper
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysSourceMapper extends BaseMapper { + + //@Update("update sys_source 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_source") + List selectListVo(); + + @Select("select * from sys_source where sid=#{sid}") + SysSource fetchBySidVo(@Param("sid") String sid); + + List listAllByRoleSid(String roleSid); + + /** + * 查询所有的资源列表 + * + * @return + */ + List listMenuTreeVo(); + + List listFunctionTreeVo(String name); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.xml new file mode 100644 index 00000000..406c30db --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceRest.java new file mode 100644 index 00000000..f99f0255 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceRest.java @@ -0,0 +1,120 @@ +package com.yxt.supervise.portal.biz.syssource; + +import com.yxt.anrui.portal.api.syssource.SysSourceDto; +import com.yxt.anrui.portal.api.syssource.SysSourceFeign; +import com.yxt.anrui.portal.api.syssource.SysSourceQuery; +import com.yxt.anrui.portal.api.syssource.SysSourceVo; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.supervise.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 io.swagger.annotations.Api; +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 javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFeignFallback.java
+ * Class: SysSourceRest
+ * Description: 资源表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资源表") +@RestController +@RequestMapping("v1/syssource") +public class SysSourceRest implements SysSourceFeign { + @Autowired + private SysUserService sysUserService; + @Autowired(required = false) + private HttpServletRequest httpServletRequest; + @Autowired + private SysSourceService sysSourceService; + @Autowired + private RedisUtil redisUtil; + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + String token = httpServletRequest.getHeader("token"); + String s = redisUtil.get(token); + SysUser sysUser = sysUserService.fetchByUserName(s); + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysSourceService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysSourceQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> listAllByRoleSid(SysSourceQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceService.listAllByRoleSid(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysSourceDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysSourceService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysSourceDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + sysSourceService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysSourceService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean delBySids(String sids) { + ResultBean rb = ResultBean.fireFail(); + String[] sidArr = sids.split(","); + sysSourceService.delBySids(sidArr); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysSourceVo vo = sysSourceService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysSourceVo vo = sysSourceService.fetchBySidVo(sid); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceService.java new file mode 100644 index 00000000..ad82bb85 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssource/SysSourceService.java @@ -0,0 +1,176 @@ +package com.yxt.supervise.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.anrui.portal.api.sysfunction.SysFunctionTreeVo; +import com.yxt.anrui.portal.api.sysmenu.SysMenuTreeVo; +import com.yxt.anrui.portal.api.syssource.SysSource; +import com.yxt.anrui.portal.api.syssource.SysSourceDto; +import com.yxt.anrui.portal.api.syssource.SysSourceQuery; +import com.yxt.anrui.portal.api.syssource.SysSourceVo; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceService.java
+ * Class: SysSourceService
+ * Description: 资源表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysSourceService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SysSourceQuery 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(SysSourceQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysSourceQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getPSid())) { + qw.eq("pSid", query.getPSid()); + } + + if (StringUtils.isNotBlank(query.getSourceId())) { + qw.eq("sourceId", query.getSourceId()); + } + + if (StringUtils.isNotBlank(query.getSourceName())) { + qw.like("sourceName", query.getSourceName()); + } + + if (StringUtils.isNotBlank(query.getPageUrl())) { + qw.eq("pageUrl", query.getPageUrl()); + } + + if (query.getIconUrl() != null) { + qw.eq("iconUrl", query.getIconUrl()); + } + + if (StringUtils.isNotBlank(query.getIconBgColor())) { + qw.eq("iconBgColor", query.getIconBgColor()); + } + + if (StringUtils.isNotBlank(query.getUrlSign())) { + qw.eq("urlSign", query.getUrlSign()); + } + + if (query.getSortNo() != null) { + qw.eq("sortNo", query.getSortNo()); + } + + if (query.getSourceType() != null) { + qw.eq("sourceType", query.getSourceType()); + } + + if (StringUtils.isNotBlank(query.getVer())) { + qw.eq("ver", query.getVer()); + } + + if (StringUtils.isNotBlank(query.getSourceUrl())) { + qw.eq("sourceUrl", query.getSourceUrl()); + } + + if (StringUtils.isNotBlank(query.getSourcePackage())) { + qw.eq("sourcePackage", query.getSourcePackage()); + } + + if (StringUtils.isNotBlank(query.getSourceAction())) { + qw.eq("sourceAction", query.getSourceAction()); + } + + if (StringUtils.isNotBlank(query.getSourceExtra())) { + qw.eq("sourceExtra", query.getSourceExtra()); + } + + if (StringUtils.isNotBlank(query.getNoticeNum())) { + qw.eq("noticeNum", query.getNoticeNum()); + } + + if (StringUtils.isNotBlank(query.getModulePluginName())) { + qw.eq("modulePluginName", query.getModulePluginName()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysSourceQuery 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(SysSourceQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysSourceDto dto){ + SysSource entity = new SysSource(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysSourceVo fetchByIdVo(String id){ + SysSource entity = this.fetchById(id); + SysSourceVo vo = new SysSourceVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public SysSourceVo fetchBySidVo(String sid) { + SysSource entity = baseMapper.fetchBySidVo(sid); + SysSourceVo vo = new SysSourceVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List listAllByRoleSid(SysSourceQuery query) { + return baseMapper.listAllByRoleSid(query.getRoleSid()); + } + + /** + * 查询所有的资源列表 + * + * @return + */ + public List listMenuTreeVo() { + return baseMapper.listMenuTreeVo(); + } + + public List listFunctionTreeVo(String name) { + return baseMapper.listFunctionTreeVo(name); + } + + +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.java new file mode 100644 index 00000000..4e8da439 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.java @@ -0,0 +1,58 @@ +package com.yxt.supervise.portal.biz.syssourcefunction; + +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.anrui.portal.api.sysfunction.SysFunctionTreeVo; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunction; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionMapper.java
+ * Class: SysSourceFunctionMapper
+ * Description: 资源与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysSourceFunctionMapper extends BaseMapper { + + //@Update("update sys_source_function 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_source_function") + List selectListVo(); + + List fetchRootFunctionBySourceSid(@Param("sourceSid") String sourceSid); + + @Delete("delete from sys_source_function where functionSid=#{functionSid} ") + void delByFunctionSid(@Param("functionSid") String functionSid); + + @Select("select * from sys_source_function where functionSid=#{functionSid} ") + SysSourceFunction fetchByFunctionSid(@Param("functionSid") String functionSid); + + /** + * 根据资源sid查询功能sid + * + * @param sid 资源sid + * @return + */ + List selectBySourceSid(String sid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.xml new file mode 100644 index 00000000..4216d769 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionRest.java new file mode 100644 index 00000000..23348bab --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionRest.java @@ -0,0 +1,88 @@ +package com.yxt.supervise.portal.biz.syssourcefunction; + +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionDto; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionFeign; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionQuery; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionVo; +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.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionFeignFallback.java
+ * Class: SysSourceFunctionRest
+ * Description: 资源与功能关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资源与功能关联表") +@RestController +@RequestMapping("v1/syssourcefunction") +public class SysSourceFunctionRest implements SysSourceFunctionFeign { + + @Autowired + private SysSourceFunctionService sysSourceFunctionService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysSourceFunctionService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysSourceFunctionQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceFunctionService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceFunctionService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysSourceFunctionDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysSourceFunctionService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysSourceFunctionDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + sysSourceFunctionService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysSourceFunctionService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysSourceFunctionVo vo = sysSourceFunctionService.fetchByIdVo(id); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionService.java new file mode 100644 index 00000000..6ccc495b --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcefunction/SysSourceFunctionService.java @@ -0,0 +1,115 @@ +package com.yxt.supervise.portal.biz.syssourcefunction; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysfunction.SysFunctionTreeVo; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunction; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionDto; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionQuery; +import com.yxt.anrui.portal.api.syssourcefunction.SysSourceFunctionVo; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceFunctionService.java
+ * Class: SysSourceFunctionService
+ * Description: 资源与功能关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysSourceFunctionService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SysSourceFunctionQuery 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(SysSourceFunctionQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysSourceFunctionQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getFunctionSid())) { + qw.eq("functionSid", query.getFunctionSid()); + } + + if (StringUtils.isNotBlank(query.getSourceSid())) { + qw.eq("sourceSid", query.getSourceSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysSourceFunctionQuery 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(SysSourceFunctionQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysSourceFunctionDto dto){ + SysSourceFunction entity = new SysSourceFunction(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysSourceFunctionVo fetchByIdVo(String id){ + SysSourceFunction entity = this.fetchById(id); + SysSourceFunctionVo vo = new SysSourceFunctionVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List fetchRootFunctionBySourceSid(String sourceSid) { + return baseMapper.fetchRootFunctionBySourceSid(sourceSid); + } + + public void delByFunctionSid(String functionSid) { + baseMapper.delByFunctionSid(functionSid); + } + + public SysSourceFunction fetchByFunctionSid(String functionSid) { + return baseMapper.fetchByFunctionSid(functionSid); + } + + /** + * 根据资源sid查询资源下的所有功能sid + * + * @param sid 资源sid + * @return + */ + public List selectBySourceSid(String sid) { + return baseMapper.selectBySourceSid(sid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.java new file mode 100644 index 00000000..5d28d2aa --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.java @@ -0,0 +1,60 @@ +package com.yxt.supervise.portal.biz.syssourcemenu; + +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.anrui.portal.api.sysmenu.SysMenuTreeVo; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenu; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysMenuRoleMapper.java
+ * Class: 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 SysSourceMenuMapper 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) QueryWrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_source_menu") + List selectListVo(); + + @Delete("delete from sys_source_menu where menuSid=#{menuSid}") + void delByMenuSid(@Param("menuSid") String roleSid); + + @Delete("delete from sys_source_menu where sourceSid=#{sourceSid}") + void delBySourceSid(@Param("sourceSid") String sourceSid); + + @Select("select * from sys_source_menu where menuSid=#{menuSid}") + SysSourceMenu fetchByMenuSid(@Param("menuSid") String menuSid); + + /** + * 菜单列表 + * + * @param sourceSid 资源sid + * @return + */ + List fetchRootMenuBySourceSid(@Param("sourceSid") String sourceSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.xml new file mode 100644 index 00000000..29ba8df7 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuRest.java new file mode 100644 index 00000000..3fd31ae6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuRest.java @@ -0,0 +1,88 @@ +package com.yxt.supervise.portal.biz.syssourcemenu; + +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuDto; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuFeign; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuQuery; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuVo; +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.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceMenuFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.SysSourceMenu.SysSourceMenuRest
+ * 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/syssourcemenu") +public class SysSourceMenuRest implements SysSourceMenuFeign { + + @Autowired + private SysSourceMenuService sysSourceMenuService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysSourceMenuService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysSourceMenuQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceMenuService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceMenuService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysSourceMenuDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysSourceMenuService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysSourceMenuDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + sysSourceMenuService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysSourceMenuService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysSourceMenuVo vo = sysSourceMenuService.fetchByIdVo(id); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuService.java new file mode 100644 index 00000000..a74e8079 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcemenu/SysSourceMenuService.java @@ -0,0 +1,112 @@ +package com.yxt.supervise.portal.biz.syssourcemenu; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysmenu.SysMenuTreeVo; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenu; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuDto; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuQuery; +import com.yxt.anrui.portal.api.syssourcemenu.SysSourceMenuVo; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceMenuService.java
+ * Class: com.yxt.anrui.portal.biz.SysSourceMenu.SysSourceMenuService
+ * 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 SysSourceMenuService extends MybatisBaseService{ + public PagerVo listPage(PagerQuery pq) { + SysSourceMenuQuery 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(SysSourceMenuQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysSourceMenuQuery 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()); + } + + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysSourceMenuQuery 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(SysSourceMenuQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysSourceMenuDto dto){ + SysSourceMenu entity = new SysSourceMenu(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysSourceMenuVo fetchByIdVo(String id){ + SysSourceMenu entity = this.fetchById(id); + SysSourceMenuVo vo = new SysSourceMenuVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByMenuSid(String roleSid) { + baseMapper.delByMenuSid(roleSid); + } + + public SysSourceMenuVo fetchByMenuSid(String sid) { + SysSourceMenu entity = baseMapper.fetchByMenuSid(sid); + SysSourceMenuVo vo = new SysSourceMenuVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 根据资源sid查询该资源下的所有菜单 + * + * @param sid 资源sid + * @return + */ + public List fetchRootMenuBySourceSid(String sid) { + return baseMapper.fetchRootMenuBySourceSid(sid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.java new file mode 100644 index 00000000..09892a22 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.java @@ -0,0 +1,43 @@ +package com.yxt.supervise.portal.biz.syssourcerole; + +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.anrui.portal.api.syssourcerole.SysSourceRole; +import com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleMapper.java
+ * Class: SysSourceRoleMapper
+ * Description: 资源与角色的关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysSourceRoleMapper extends BaseMapper { + + //@Update("update sys_source_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_source_role") + List selectListVo(); + @Delete("delete from sys_source_role where roleSid=#{roleSid} ") + void delByRoleSid(@Param("roleSid") String roleSid ); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.xml new file mode 100644 index 00000000..c66ee2de --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleRest.java new file mode 100644 index 00000000..b8a9a66c --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleRest.java @@ -0,0 +1,114 @@ +package com.yxt.supervise.portal.biz.syssourcerole; + +import com.yxt.anrui.portal.api.sysrole.SysRole; +import com.yxt.anrui.portal.api.syssourcerole.*; +import com.yxt.supervise.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 io.swagger.annotations.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleFeignFallback.java
+ * Class: SysSourceRoleRest
+ * Description: 资源与角色的关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "资源与角色的关联表") +@RestController +@RequestMapping("v1/syssourcerole") +public class SysSourceRoleRest implements SysSourceRoleFeign { + + @Autowired + private SysSourceRoleService sysSourceRoleService; + @Autowired + private SysRoleService sysRoleService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysSourceRoleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysSourceRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceRoleService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysSourceRoleService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysSourceRoleDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysSourceRoleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysSourceRoleDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + sysSourceRoleService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + @Override + public ResultBean updateRoleAndSource(SysSourceRoleDto dto){ + String roleSid=dto.getRoleSid(), sourceSid =dto.getSorceSid(); + 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不存在"); + } + } + sysSourceRoleService.delByRoleSid(roleSid); + ResultBean rb = ResultBean.fireFail(); + if(!StringUtils.isBlank(sourceSid)){ + String[] sids = sourceSid.split(","); + for(String sid:sids){ + SysSourceRole sysSourceRole = new SysSourceRole(); + sysSourceRole.setRoleSid(roleSid); + sysSourceRole.setSorceSid(sid); + sysSourceRoleService.save(sysSourceRole); + } + } + return rb.success(); + } + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysSourceRoleService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysSourceRoleVo vo = sysSourceRoleService.fetchByIdVo(id); + return rb.success().setData(vo); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleService.java new file mode 100644 index 00000000..c54f900a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/syssourcerole/SysSourceRoleService.java @@ -0,0 +1,96 @@ +package com.yxt.supervise.portal.biz.syssourcerole; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.syssourcerole.SysSourceRole; +import com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleDto; +import com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleQuery; +import com.yxt.anrui.portal.api.syssourcerole.SysSourceRoleVo; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysSourceRoleService.java
+ * Class: SysSourceRoleService
+ * Description: 资源与角色的关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysSourceRoleService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SysSourceRoleQuery 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(SysSourceRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysSourceRoleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getSorceSid())) { + qw.eq("sorceSid", query.getSorceSid()); + } + + if (StringUtils.isNotBlank(query.getRoleSid())) { + qw.eq("roleSid", query.getRoleSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysSourceRoleQuery 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(SysSourceRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysSourceRoleDto dto){ + SysSourceRole entity = new SysSourceRole(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysSourceRoleVo fetchByIdVo(String id){ + SysSourceRole entity = this.fetchById(id); + SysSourceRoleVo vo = new SysSourceRoleVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByRoleSid(String roleSid) { + baseMapper.delByRoleSid(roleSid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.java new file mode 100644 index 00000000..4c8be404 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.java @@ -0,0 +1,125 @@ +package com.yxt.supervise.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.anrui.portal.api.sysorganization.AppContactSysOrganizationVo; +import com.yxt.anrui.portal.api.sysstaffinfo.*; +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoMapper.java
+ * Class: SysStaffinfoMapper
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysStaffinfoMapper extends BaseMapper { + + //@Update("update sys_staffinfo set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selectAppContactsList(); + + IPage searchAppContactsPageList(IPage page, @Param("list") List list, + @Param("chnStr") String chnStr, @Param("mobileStr") String mobileStr); + + AppContactsDetailsVo selectAppContactsVO(String staffSid); + + List selectContactsByOrgsid(@Param("sid") String sid); + + SysStaffinfo selectJobNumber(); + + /** + * 查询员工的手机号是否重复 + * + * @param mobile 手机号 + * @return + */ + SysStaffinfo selectByMobile(String mobile); + + /** + * 查询是否存在该身份证号的员工 + * + * @param idNo 身份证号 + * @return + */ + SysStaffinfo selectByIdNo(String idNo); + + /** + * 员工管理分页列表 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage pagerList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + /** + * 根据员工sid和员工手机号码查询员工信息是否已存在 + * + * @param mobile 手机号 + * @param sid 员工sid + * @return + */ + SysStaffinfo selectByMobileAndSid(@Param("mobile") String mobile, @Param("sid") String sid); + + /** + * 根据员工sid和身份证号查询员工信息是否已存在 + * + * @param idNo 身份证号 + * @param sid 员工sid + * @return + */ + SysStaffinfo selectByIdNoAndSid(@Param("idNo") String idNo, @Param("sid") String sid); + + /** + * 根据员工sid查询员工信息 + * + * @param sid 员工sid + * @return + */ + SysStaffinfoDetailsVo selectDetailsBySid(@Param("sid") String sid, @Param("path") String path); + + /** + * 根据员工sid更新信息 + * + * @param personType 员工类型 + * @param personTypeKey 员工类型key + * @param sid 员工sid + * @return + */ + int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey, + @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason); + + /** + * 查询当前分公司下的员工信息 + * + * @param orgSid 分公司sid + * @return + */ + List selectStaffList(String orgSid); + + List> getStaffName(@Param(Constants.WRAPPER) Wrapper> qw); + + List> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper> qw); + + IPage getUserList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("orgSid") String orgSid); + + List getGressionUserList(@Param("userOrgSid")String userOrgSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml new file mode 100644 index 00000000..e81befd4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -0,0 +1,379 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update sys_staffinfo + set personType = #{personType}, + personTypeKey = #{personTypeKey}, + quitDate = #{date}, + quitReason = #{reason} + where sid = #{sid} + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoRest.java new file mode 100644 index 00000000..7301cad2 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoRest.java @@ -0,0 +1,203 @@ +package com.yxt.supervise.portal.biz.sysstaffinfo; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysstaffinfo.*; +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.supervise.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 io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; +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 java.text.SimpleDateFormat; +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoFeignFallback.java
+ * Class: SysStaffinfoRest
+ * Description: 人员基础信息表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "人员基础信息表") +@RestController +@RequestMapping("v1/sysstaffinfo") +public class SysStaffinfoRest implements SysStaffinfoFeign { + + private final Long PAGECURRENT = 2L; + private final Long PAGESIZE = 2L; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + + @Autowired + private SysStaffinfoService sysStaffinfoService; + + @Autowired + private SysUserService sysUserService; + @Autowired + private FileUploadComponent fileUploadComponent; + + /** + * 员工管理的分页列表 + * + * @param pq 查询条件 + * @return + */ + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + IPage page = sysStaffinfoService.pagerList(pq); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return rb.success().setData(pv1); + } + + /** + * 员工信息的新增保存 + * + * @param dto 数据传输对象 + * @return + */ + @Override + public ResultBean save(SysStaffinfoDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = sysStaffinfoService.saveStaffInfo(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setMsg(resultBean.getMsg()); + } + + /** + * 员工信息的修改保存 + * + * @param dto 数据传输对象 + * @param sid 员工信息sid + * @return + */ + @Override + public ResultBean update(SysStaffinfoDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + ResultBean resultBean = sysStaffinfoService.updateStaffInfo(dto, sid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setMsg(resultBean.getMsg()); + } + + /** + * 进行删除操作，即设置员工类型为离职类型02的操作。 + * + * @param sysStaffQuery 数据传输对象 + * @return + */ + @Override + public ResultBean del(SysStaffQuery sysStaffQuery) { + ResultBean rb = ResultBean.fireFail(); + //查询员工是否是离职 + SysStaffinfo sysStaffinfo = sysStaffinfoService.fetchBySid(sysStaffQuery.getSid()); + if (sysStaffinfo == null) { + return rb.setMsg("员工不存在"); + } + if ("01".equals(sysStaffinfo.getPersonTypeKey())) { + return rb.setMsg("此员工已是离职人员"); + + } + int i = sysStaffinfoService.del(sysStaffQuery); + if (i == 0) { + return rb.setMsg("失败"); + } + return rb.success().setMsg("成功"); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysStaffinfoDetailsVo sysStaffinfo = sysStaffinfoService.selectDetailsBySid(sid); + if (sysStaffinfo == null) { + return rb.setData(new SysStaffinfoDetailsVo()); + } + return rb.success().setData(sysStaffinfo); + } + + @Override + public ResultBean>> getStaffName(String staffName,String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List> staffNameList = sysStaffinfoService.getStaffName(staffName,deptSid); + return rb.success().setData(staffNameList); + } + + @Override + public ResultBean>> getStaffNameByDeptSid(String staffName, String deptSid) { + ResultBean rb = ResultBean.fireFail(); + List> staffNameList = sysStaffinfoService.getStaffNameByDeptSid(staffName, deptSid); + return rb.success().setData(staffNameList); + } + + + @Override + public ResultBean> selectAppContactsList(String names) { + return new ResultBean>().success().setData(sysStaffinfoService.selectAppContactsList()); + } + + @Override + public ResultBean selectAppContactsVO(String staffSid) { + if (StringUtils.isBlank(staffSid)) { + return new ResultBean().fail().setMsg("staffSid不能为空"); + } + AppContactsDetailsVo appContactsDetailsVo = sysStaffinfoService.selectAppContactsVO(staffSid); + if (appContactsDetailsVo == null) { + return new ResultBean().fail().setMsg("查无此人信息"); + } + if (StringUtils.isNotBlank(appContactsDetailsVo.getHeadImage())) { + appContactsDetailsVo.setHeadImage(fileUploadComponent.getUrlPrefix() + appContactsDetailsVo.getHeadImage()); + } + return new ResultBean().success().setData(appContactsDetailsVo); + } + + @Override + public ResultBean> searchAppContactsList(PagerQuery pq) { + String names = pq.getParams().getName(); + if (StringUtils.isBlank(names)) + return new ResultBean>().fail().setMsg("搜索内容不能为空"); + PagerVo page1 = new PagerVo<>(); + IPage iPage = sysStaffinfoService.searchAppContactsList(pq, names); + //把Ipage转换为PageVo + PagerVo pv_result = PagerUtil.pageToVo(iPage, page1); + pv_result.setMsg("找到 " + pv_result.getTotal() + " 个联系人 "); + return new ResultBean>().success().setData(pv_result); + } + + @Override + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + return sysStaffinfoService.selectStaffList(pcSysStaffQuery); + } + + @Override + public ResultBean> getUserList(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysStaffinfoService.getUserList(pagerQuery); + return rb.success().setData(pv); + } + + @Override + public ResultBean> getGressionUserList(String userSid) { + return sysStaffinfoService.getGressionUserList(userSid); + } + + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoService.java new file mode 100644 index 00000000..e1bc3484 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -0,0 +1,745 @@ +package com.yxt.supervise.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.anrui.portal.api.sysorganization.AppContactSysOrganizationVo; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; +import com.yxt.anrui.portal.api.sysrole.SysRoleVo; +import com.yxt.anrui.portal.api.sysstaffinfo.*; +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery; +import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRole; +import com.yxt.supervise.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.supervise.portal.biz.syspost.SysPostService; +import com.yxt.supervise.portal.biz.sysrole.SysRoleService; +import com.yxt.supervise.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.supervise.portal.biz.sysstaffpost.SysStaffPostService; +import com.yxt.supervise.portal.biz.sysuser.SysUserService; +import com.yxt.supervise.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; +import com.yxt.common.base.utils.Encodes; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.PinYinUtils; +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.text.SimpleDateFormat; +import java.util.*; + +import static java.util.stream.Collectors.toList; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffinfoService.java
+ * Class: SysStaffinfoService
+ * Description: 人员基础信息表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysStaffinfoService extends MybatisBaseService { + + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private SysUserService sysUserService; + @Autowired + private SysStaffOrgService sysStaffOrgService; + @Autowired + private SysStaffPostService sysStaffPostService; + @Autowired + private SysPostService sysPostService; + @Autowired + private SysOrganizationService sysOrganizationService; + @Autowired + private SysUserRoleService sysUserRoleService; + @Autowired + private SysRoleService sysRoleService; + @Autowired + private RedisUtil redisUtil; + + public List selectAppContactsList() { + List list = baseMapper.selectAppContactsList(); + list.stream().forEach(vo -> { + if (StringUtils.isNotBlank(vo.getHeadImage())) { + vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage()); + } + }); + return list; + } + + public IPage searchAppContactsList(PagerQuery pagerQuery, String names) { + Map map = new HashMap<>(); + List paramList = new ArrayList<>(); + String chnStr = ""; // 中文查询字符串 + String mobileStr = ""; // 中文查询字符串 + if (StringUtils.isNotBlank(names)) { + if (names.matches("^\\d*$")) { // 数字 + mobileStr = names; + } else { + String[] namesArray = names.split(""); + for (int i = 0; i < namesArray.length; i++) { + if (StringUtils.isNotBlank(namesArray[i])) { + if (namesArray[i].matches("^[\u4e00-\u9fa5]+$")) { // 中文 + chnStr = chnStr + namesArray[i]; + } + String pinYinName = PinYinUtils.getPinYinName(namesArray[i]); + if (pinYinName.equals("_") || pinYinName.equals("%")) { + pinYinName = "\\" + pinYinName; + } + paramList.add(pinYinName); + } + } + } + } + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage iPage = baseMapper.searchAppContactsPageList(page, paramList, chnStr, mobileStr); + List list = iPage.getRecords(); + list.stream().forEach(vo -> { + if (StringUtils.isNotBlank(vo.getHeadImage())) { + vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage()); + } + }); + map.put("list", list); + map.put("info", "找到 " + iPage.getRecords().size() + " 个联系人 "); + return iPage; + } + + public AppContactsDetailsVo selectAppContactsVO(String staffSid) { + return baseMapper.selectAppContactsVO(staffSid); + } + + /** + * pc端员工管理分页列表查询条件封装 + * + * @param query 查询条件 + * @return + */ + private QueryWrapper createQueryWrapper(SysStaffinfoQuery query) { + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) {//姓名 + qw.like("si.name", query.getName()); + } + if (StringUtils.isNotBlank(query.getOrgSid())) { + qw.eq("so.orgSid", query.getOrgSid()); + } + if (StringUtils.isNotBlank(query.getPostSid())) { + qw.eq("ssp.postSid", query.getPostSid()); + } + if (StringUtils.isNotBlank(query.getMobile())) { + qw.like("si.mobile", query.getMobile()); + } + String joinCompnyDateStart = query.getJoinCompnyDateStart(); + String joinCompnyDateEnd = query.getJoinCompnyDateEnd(); + qw.apply(StringUtils.isNotEmpty(joinCompnyDateStart), "date_format (joinCompnyDate,'%Y-%m-%d') >= date_format('" + joinCompnyDateStart + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(joinCompnyDateEnd), "date_format (joinCompnyDate,'%Y-%m-%d') <= date_format('" + joinCompnyDateEnd + "','%Y-%m-%d')" + ); + //员工类型key + if (StringUtils.isNotBlank(query.getPersonTypeKey())) { + qw.eq("si.personTypeKey", query.getPersonTypeKey()); + } + qw.orderByDesc("si.id"); + return qw; + } + + /** + * 员工管理分页列表 + * + * @param pagerQuery 查询条件 + * @return + */ + public IPage pagerList(PagerQuery pagerQuery) { + // mybits所用的分页对对象 + IPage page = PagerUtil.queryToPage(pagerQuery); + // mybits所用的查询条件封装类 + QueryWrapper qw = createQueryWrapper(pagerQuery.getParams()); + IPage sysStaffinfoVoIPage = baseMapper.pagerList(page, qw); + List records = sysStaffinfoVoIPage.getRecords(); + for (SysStaffinfoVo record : records) { + String orgSid = record.getOrgSid(); + String orgName = ""; + if (StringUtils.isNotBlank(orgSid)) { + String[] split = orgSid.split(","); + for (String s : split) { + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s); + if(sysOrganization == null){ + sysStaffOrgService.delByOrgSid(s); + }else{ + //从本级部门信息中获取上级sid + String psid = sysOrganization.getPsid(); + //从本级部门信息中获取本级部门名称 + String bjName = sysOrganization.getName(); + //获取上级sid获取上级部门信息 + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid); + //从上级部门信息中获取上级部门名称 + String sjName = sysOrganization1.getName(); + orgName += sjName + "-" + bjName + ","; + } + } + orgName = orgName.substring(0, orgName.length() - 1); + record.setOrgName(orgName); + } + } + return sysStaffinfoVoIPage; + } + + public List selectContactsByOrgsid(String sid) { + List list = baseMapper.selectContactsByOrgsid(sid); + list.stream().forEach(vo -> { + if (StringUtils.isNotBlank(vo.getHeadImage())) { + vo.setHeadImage(fileUploadComponent.getUrlPrefix() + vo.getHeadImage()); + } + }); + return list; + + } + + /** + * 员工信息的新增保存 + * + * @param dto 数据传输对象 + * @return + */ + public ResultBean saveStaffInfo(SysStaffinfoDto dto) { + ResultBean rb = ResultBean.fireFail(); + SysRoleVo sysRoleVo = sysRoleService.fetchByName("试用期员工"); + if (sysRoleVo == null) { + return rb.setMsg("缺少默认试用期员工角色"); + } + //员工类型 + //String personTypeKey = dto.getPersonTypeKey(); + String jobNumber = ""; + SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber(); + if (sysStaffinfo == null) { + //无此员工类型的员工 + jobNumber = addOne("0000"); + } else { + jobNumber = sysStaffinfo.getJobNumber(); + jobNumber = addOne(jobNumber); + } + //查询员工的手机号是否重复 + SysStaffinfo sysStaffinfo1 = baseMapper.selectByMobile(dto.getMobile()); + SysUser sysUser1 = sysUserService.selectByMobile(dto.getMobile()); + if (sysStaffinfo1 != null || sysUser1 != null) { + return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工"); + } + //查询是否存在该身份证号的员工 + SysStaffinfo sysStaffinfo2 = baseMapper.selectByIdNo(dto.getIdNo()); + if (sysStaffinfo2 != null) { + return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工"); + } + //判断身份证号出生日期和填写的出生日期是否相同 + String idNo = dto.getIdNo(); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); + String birthday = simpleDateFormat.format(dto.getBirthday()); + String substring = idNo.substring(6, 14); + if (!birthday.equals(substring)) { + return rb.setMsg("选择的出生日期和身份证出生日期不符，请重新选择"); + } + //查询部门和岗位是否为空 + if (dto.getSysStaffOrg() == null) { + return rb.setMsg("员工部门信息不能为空"); + } + if (dto.getSysStaffPost() == null) { + return rb.setMsg("员工岗位信息不能为空"); + } + Date joinCompnyDate = dto.getJoinCompnyDate(); + if (joinCompnyDate == null) { + return rb.setMsg("员工入职日期不能为空"); + } + //添加员工基础信息 + SysStaffinfo sysStaffinfo3 = new SysStaffinfo(); + dto.fillEntity(sysStaffinfo3); + sysStaffinfo3.setJobNumber(jobNumber); + sysStaffinfo3.setPinYinName(PinYinUtils.getPinYinName(dto.getName())); + sysStaffinfo3.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName())); + //是否意外险参保 + if (dto.getIsHaveInsurance() != null) { + //意外险参保：是 + if (dto.getIsHaveInsurance() == 1) { + //意外险参保地以及意外险参保开始时间和结束时间不能为空 + if (dto.getInsuranceStartDate() == null) { + return rb.setMsg("意外险参保时间不能为空"); + } + if (dto.getInsuranceEndDate() == null) { + return rb.setMsg("意外险终止时间不能为空"); + } + if (StringUtils.isBlank(dto.getInsuranceAddr())) { + return rb.setMsg("意外险参保地不能为空"); + } + } else { + sysStaffinfo3.setIsHaveInsurance(0); + sysStaffinfo3.setInsuranceStartDate(null); + sysStaffinfo3.setInsuranceEndDate(null); + sysStaffinfo3.setInsuranceAddr(null); + } + } + if ("01".equals(dto.getPersonTypeKey())) { + if (dto.getQuitDate() == null) { + return rb.setMsg("离职日期不能为空"); + } + if (StringUtils.isBlank(dto.getQuitReason())) { + return rb.setMsg("离职原因不能为空"); + } + } + //身份证(人像面) + if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardA())) { + if (sysStaffinfo3.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo3.setIdCardA(sysStaffinfo3.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //身份证(国徽面) + if (StringUtils.isNotBlank(sysStaffinfo3.getIdCardB())) { + if (sysStaffinfo3.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo3.setIdCardB(sysStaffinfo3.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //学历证书diploma + if (StringUtils.isNotBlank(sysStaffinfo3.getDiploma())) { + if (sysStaffinfo3.getDiploma().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo3.setDiploma(sysStaffinfo3.getDiploma().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //学位证书degreeCertificate + if (StringUtils.isNotBlank(sysStaffinfo3.getDegreeCertificate())) { + if (sysStaffinfo3.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo3.setDegreeCertificate(sysStaffinfo3.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //前公司离职证明leaveCertificate + if (StringUtils.isNotBlank(sysStaffinfo3.getLeaveCertificate())) { + if (sysStaffinfo3.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo3.setLeaveCertificate(sysStaffinfo3.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //员工照片 + if (StringUtils.isNotBlank(sysStaffinfo3.getPhoto())) { + if (sysStaffinfo3.getPhoto().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo3.setPhoto(sysStaffinfo3.getPhoto().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //增加员工的关联的部门信息 + SysStaffOrg sysStaffOrg = new SysStaffOrg(); + SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg(); + if (StringUtils.isBlank(sysStaffOrgDto.getOrgName())) { + return rb.setMsg("所在部门不能为空"); + } + sysStaffOrgDto.fillEntity(sysStaffOrg); + sysStaffOrg.setStaffSid(sysStaffinfo3.getSid()); + sysStaffOrg.setManageType("3"); + sysStaffOrgService.save(sysStaffOrg); + //增加员工的关联的岗位信息 + SysStaffPost sysStaffPost = new SysStaffPost(); + SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost(); + if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) { + return rb.setMsg("岗位不能为空"); + } + + save(sysStaffinfo3); + //添加用户信息 + SysUser sysUser = new SysUser(); + sysUser.setStaffSid(sysStaffinfo3.getSid()); + sysUser.setUserName(jobNumber); + sysUser.setMobile(sysStaffinfo3.getMobile()); + sysUser.setUserType(1); + String password = sysStaffinfo3.getMobile().substring(5, 11); + String md5 = Encodes.md5(password); + sysUser.setPassword(md5); + boolean isSave = sysUserService.save(sysUser); + sysStaffPostDto.fillEntity(sysStaffPost); + sysStaffPost.setStaffSid(sysStaffinfo3.getSid()); + sysStaffPost.setStartDate(new Date()); + sysStaffPostService.save(sysStaffPost); + if (!isSave) { + return rb.setMsg("添加员工信息失败"); + } + SysUserRole sysUserRole = new SysUserRole(); + sysUserRole.setUserSid(sysUser.getSid()); + sysUserRole.setRoleSid(sysRoleVo.getSid()); + sysUserRoleService.save(sysUserRole); + return rb.success().setMsg("添加员工信息成功"); + + } + + /** + * 字符串+1方法，该方法将其结尾的整数+1,适用于任何以整数结尾的字符串,不限格式，不限分隔符。 + * + * @param testStr 要+1的字符串 + * @return +1后的字符串 + * @throws NumberFormatException + */ + public static String addOne(String testStr) { + //根据不是数字的字符拆分字符串 + String[] strs = testStr.split("[^0-9]"); + //取出最后一组数字 + String numStr = strs[strs.length - 1]; + //如果最后一组没有数字(也就是不以数字结尾)，抛NumberFormatException异常 + if (numStr != null && numStr.length() > 0) { + //取出字符串的长度 + int n = numStr.length(); + //将该数字加一 + int num = Integer.parseInt(numStr) + 1; + String added = String.valueOf(num); + n = Math.min(n, added.length()); + //拼接字符串 + return testStr.subSequence(0, testStr.length() - n) + added; + } else { + throw new NumberFormatException(); + } + } + + /** + * 员工信息修改保存 + * + * @param dto 数据传输对象 + * @param sid 员工信息sid + * @return + */ + public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + //查询该人员的组织机构list + List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(sid); + List orgList = new ArrayList<>(); + if (sysStaffOrgVos.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos) { + String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if (sysOrganization != null) { + orgList.add(orgSid); + } else { + continue; + } + } + } + //根据员工sid查询员工的信息 + SysStaffinfo sysStaffinfo = fetchBySid(sid); + if (sysStaffinfo == null) { + return rb.setMsg("此员工信息不存在"); + } + //查询员工的手机号是否重复 + SysStaffinfo sysStaffinfo2 = baseMapper.selectByMobileAndSid(dto.getMobile(), sid); + if (sysStaffinfo2 != null) { + return rb.setMsg("已存在手机号为" + dto.getMobile() + "的员工"); + } + //查询是否存在该身份证号的员工 + SysStaffinfo sysStaffinfo3 = baseMapper.selectByIdNoAndSid(dto.getIdNo(), sid); + if (sysStaffinfo3 != null) { + return rb.setMsg("已存在身份证号为" + dto.getIdNo() + "的员工"); + } + //更新员工基础信息 + BeanUtil.copyProperties(dto, sysStaffinfo); + sysStaffinfo.setJobNumber(dto.getJobNumber()); + sysStaffinfo.setPinYinName(PinYinUtils.getPinYinName(dto.getName())); + sysStaffinfo.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(dto.getName())); + //是否意外险参保 + if (dto.getIsHaveInsurance() != null) { + //意外险参保：是 + if (dto.getIsHaveInsurance() == 1) { + //意外险参保地以及意外险参保开始时间和结束时间不能为空 + if (dto.getInsuranceStartDate() == null) { + return rb.setMsg("意外险参保时间不能为空"); + } + if (dto.getInsuranceEndDate() == null) { + return rb.setMsg("意外险终止时间不能为空"); + } + if (StringUtils.isBlank(dto.getInsuranceAddr())) { + return rb.setMsg("意外险参保地不能为空"); + } + } else { + sysStaffinfo.setIsHaveInsurance(0); + sysStaffinfo.setInsuranceStartDate(null); + sysStaffinfo.setInsuranceEndDate(null); + sysStaffinfo.setInsuranceAddr(null); + } + } + if ("01".equals(dto.getPersonTypeKey())) { + if (dto.getQuitDate() == null) { + return rb.setMsg("离职日期不能为空"); + } + if (StringUtils.isBlank(dto.getQuitReason())) { + return rb.setMsg("离职原因不能为空"); + } + } + //身份证(人像面) + if (StringUtils.isNotBlank(sysStaffinfo.getIdCardA())) { + if (sysStaffinfo.getIdCardA().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo.setIdCardA(sysStaffinfo.getIdCardA().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //身份证(国徽面) + if (StringUtils.isNotBlank(sysStaffinfo.getIdCardB())) { + if (sysStaffinfo.getIdCardB().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo.setIdCardB(sysStaffinfo.getIdCardB().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //学历证书diploma + if (StringUtils.isNotBlank(sysStaffinfo.getDiploma())) { + if (sysStaffinfo.getDiploma().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo.setDiploma(sysStaffinfo.getDiploma().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //学位证书degreeCertificate + if (StringUtils.isNotBlank(sysStaffinfo.getDegreeCertificate())) { + if (sysStaffinfo.getDegreeCertificate().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo.setDegreeCertificate(sysStaffinfo.getDegreeCertificate().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //前公司离职证明leaveCertificate + if (StringUtils.isNotBlank(sysStaffinfo.getLeaveCertificate())) { + if (sysStaffinfo.getLeaveCertificate().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo.setLeaveCertificate(sysStaffinfo.getLeaveCertificate().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //员工照片 + if (StringUtils.isNotBlank(sysStaffinfo.getPhoto())) { + if (sysStaffinfo.getPhoto().contains(fileUploadComponent.getUrlPrefix())) { + sysStaffinfo.setPhoto(sysStaffinfo.getPhoto().replace(fileUploadComponent.getUrlPrefix(), "")); + } + } + //更新用户信息 + sysUserService.updateByStaffSid(dto.getJobNumber(), sysStaffinfo.getMobile(), sid); + //更新员工的关联的部门信息 + SysStaffOrgDto sysStaffOrgDto = dto.getSysStaffOrg(); + int count = sysStaffOrgService.selectByStaffAndOrg(sysStaffOrgDto.getOrgSidPath(), sid, "2"); + if (count > 0) { + sysStaffOrgService.deleteByStaffSidAndType(sysStaffOrgDto.getOrgSidPath(), sid, "2"); + } + SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSidAndPath(sid,sysStaffOrgDto.getOrgSidPath()); + if(sysStaffOrg == null){ + ResultBean staffOrgResultBean = sysStaffOrgService.selectAllByStaffSid(sid); + sysStaffOrg = staffOrgResultBean.getData(); + if(sysStaffOrg == null){ + sysStaffOrg = new SysStaffOrg(); + sysStaffOrg.setStaffSid(sid); + BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + sysStaffOrg.setManageType("3"); + sysStaffOrgService.insert(sysStaffOrg); + }else{ + BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + sysStaffOrg.setManageType("3"); + sysStaffOrgService.updateById(sysStaffOrg); + } + }else{ + BeanUtil.copyProperties(sysStaffOrgDto,sysStaffOrg); + sysStaffOrg.setManageType("3"); + sysStaffOrgService.updateById(sysStaffOrg); + } + + //更新员工的关联的岗位信息 + SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid); + SysStaffPost sysStaffPost = sysStaffPostService.selectByStaffSid(sid, staffPostDetailsVo.getPostSid()); + SysStaffPostDto sysStaffPostDto = dto.getSysStaffPost(); + sysStaffPostService.updateBySid(sysStaffPostDto, sysStaffPost.getSid()); + boolean isUpdate = updateById(sysStaffinfo); + if (!isUpdate) { + return rb.setMsg("更新员工信息失败"); + } + List sysStaffOrgVos1 = sysStaffOrgService.selectByStaffS(sid); + List orgList1 = new ArrayList<>(); + if (sysStaffOrgVos1.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos1) { + String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if (sysOrganization != null) { + orgList1.add(orgSid); + } else { + continue; + } + } + } + List reduce1 = orgList.stream().filter(item -> !orgList1.contains(item)).collect(toList()); + if (reduce1.size() > 0) { + //根据staffSid查询token + String token = sysUserService.selectByStaffsid(sid).getToken(); + //清空该token + redisUtil.remove(token); + } + return rb.success().setMsg("更新员工信息成功"); + } + + /** + * 根据员工sid查询员工信息 + * + * @param sid 员工sid + * @return + */ + public SysStaffinfoDetailsVo selectDetailsBySid(String sid) { + String path = fileUploadComponent.getUrlPrefix(); + SysStaffinfoDetailsVo sysStaffinfoDetailsVo = baseMapper.selectDetailsBySid(sid, path); + if (sysStaffinfoDetailsVo != null) { + List sysStaffOrgList = sysStaffOrgService.getOrgByStaffSidList(sid); + String orgSid = ""; + String type = ""; + for (SysStaffOrg s : sysStaffOrgList) { + if ("3".equals(s.getManageType())) { + orgSid = s.getOrgSid(); + type = s.getManageType(); + break; + } else if ("1".equals(s.getManageType())) { + orgSid = s.getOrgSid(); + type = s.getManageType(); + break; + } else { + orgSid = s.getOrgSid(); + type = s.getManageType(); + } + } + SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(sid); + SysStaffOrgDetailsVo sysStaffOrgDetailsVo = sysStaffOrgService.selectByStaffByType(sid, orgSid, type); + SysStaffPostDetailsVo sysStaffPostDetailsVo = sysStaffPostService.selectByStaff(sid, staffPostDetailsVo.getPostSid()); + if(sysStaffOrgDetailsVo != null){ + sysStaffinfoDetailsVo.setSysStaffOrg(sysStaffOrgDetailsVo); + }else{ + sysStaffinfoDetailsVo.setSysStaffOrg(new SysStaffOrgDetailsVo()); + } + if(sysStaffPostDetailsVo != null){ + sysStaffinfoDetailsVo.setSysStaffPost(sysStaffPostDetailsVo); + }else{ + sysStaffinfoDetailsVo.setSysStaffPost(new SysStaffPostDetailsVo()); + } + + + + } + return sysStaffinfoDetailsVo; + } + + /** + * 员工信息的删除操作，即设置员工类型为离职状态。 + * + * @param sysStaffQuery 员工sid + * @return + */ + public int del(SysStaffQuery sysStaffQuery) { + int count = 0; + //员工类型离职状态 + String personTypeKey = "01"; + String personType = "离职"; + //String jobNumber = ""; + //SysStaffinfo sysStaffinfo = baseMapper.selectJobNumber(personTypeKey); + /* if (sysStaffinfo == null) { + //无此员工类型的员工 + jobNumber = addOne("9000"); + } else { + jobNumber = sysStaffinfo.getJobNumber(); + jobNumber = addOne(jobNumber); + } + jobNumber = sysStaffinfo.getJobNumber();*/ + //更新员工的员工状态以及员工工号 + int j = baseMapper.updateBySid(personType, personTypeKey, sysStaffQuery.getSid(), sysStaffQuery.getQuitDate(), sysStaffQuery.getQuitReason()); + //更新用户表中该员工的员工工号 + //sysUserService.updateByStaSid(jobNumber, sysStaffQuery.getSid()); + if (j > 0) { + count++; + } + return count; + } + + public ResultBean> selectStaffList(PcSysStaffQuery pcSysStaffQuery) { + ResultBean> rb = ResultBean.fireFail(); + //根据当前staffSid查询分公司sid + String orgSid = ""; + List list = new ArrayList<>(); + ResultBean stringResultBean = sysStaffOrgService.selectSidPathByStaffSid(pcSysStaffQuery.getStaffSid()); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } + if (StringUtils.isNotBlank(orgSid)) { + list = baseMapper.selectStaffList(orgSid); + } + return rb.success().setData(list); + } + + public List> getStaffName(String staffName,String deptSid) { + QueryWrapper> qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(staffName)) { + qw.like("ss.name", staffName); + } + qw.eq("ss.isDelete", 0); + qw.ne("sso.orgSid", deptSid); + return baseMapper.getStaffName(qw); + } + + public List> getStaffNameByDeptSid(String staffName, String deptSid) { + QueryWrapper> qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(staffName)) { + qw.like("ss.name", staffName); + } + qw.eq("sso.orgSid", deptSid); + qw.eq("ss.isDelete", 0); + return baseMapper.getStaffNameByDeptSid(qw); + } + + public PagerVo getUserList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + AppSysStaffQuery params = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + String orgSid = ""; + if (params != null) { + if(StringUtils.isBlank(params.getOrgPath())){ + if (StringUtils.isNotBlank(params.getUserSid())) { + ResultBean stringResultBean = sysStaffOrgService.getPathSidByUserSid(params.getUserSid()); + if (stringResultBean.getSuccess()) { + orgSid = stringResultBean.getData(); + } + } + }else{ + String orgPath = params.getOrgPath(); + orgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData(); + } + + if (StringUtils.isNotBlank(params.getName())) { + qw.like("si.name", params.getName()); + } + + if (params.getSelectSid().size() > 0){ + qw.notIn("su.sid",params.getSelectSid()); + } + } + IPage pagging = baseMapper.getUserList(page, qw, orgSid); + List list = pagging.getRecords(); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + for (AppSysStaffVo vo : list) { + String headImage = vo.getHeadImage(); + if (StringUtils.isNotBlank(headImage)) { + if (!headImage.contains(fileUploadComponent.getUrlPrefix())) { + headImage = fileUploadComponent.getUrlPrefix() + headImage; + } + vo.setUserImage(headImage); + } + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean> getGressionUserList(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + String userOrgSid = sysStaffOrgService.getPathSidByUserSid(userSid).getData(); + List list = baseMapper.getGressionUserList(userOrgSid); + return rb.success().setData(list); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.java new file mode 100644 index 00000000..d23505c6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -0,0 +1,109 @@ +package com.yxt.supervise.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.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgMapper.java
+ * Class: SysStaffOrgMapper
+ * Description: 员工部门关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysStaffOrgMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_staff_org") + List selectListVo(); + + @Delete("delete from sys_staff_org where orgSid=#{orgSid} ") + void delByOrgSid(@Param("orgSid") String sid); + + @Select("select staffOrg.manageType as manageType,staffOrg.orgSid as orgSid,staffinfo.name as staffName,staffinfo.sid as staffSid " + + "from sys_staff_org staffOrg left join sys_staffinfo staffinfo on staffinfo.sid=staffOrg.staffSid " + + "where staffOrg.orgSid=#{orgSid} ") + List fetchByOrgSid(@Param("orgSid") String orgSid); + + @Delete("delete from sys_staff_org where staffSid=#{staffSid} ") + void deleteByStaffSid(String staffSid); + + List staffinfoList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + @Select("select * from sys_staff_org where staffSid=#{staffSid}") + List getSysStaffOrgListByStaffSid(@Param("staffSid") String staffSid); + + @Select("select * from sys_staff_org where staffSid=#{staffSid} and manageType = '3'") + List getSysStaffOrgListByStaff(@Param("staffSid") String staffSid); + + /** + * 根据员工sid更新员工信息 + * + * @param sid 员工sid + * @return + */ + SysStaffOrg selectByStaffSid(@Param("sid") String sid, @Param("orgSid") String orgSid); + + /** + * 员工部门信息详情 + * + * @param sid 员工sid + * @return + */ + SysStaffOrgDetailsVo selectByStaff(@Param("sid") String sid, @Param("orgSid") String orgSid); + + SysStaffOrgDetailsVo selectByStaffByType(@Param("sid") String sid, @Param("orgSid") String orgSid, @Param("type") String type); + + @Select("SELECT GROUP_CONCAT(DISTINCT(orgSid)) FROM sys_staff_org WHERE staffSid=#{staffSid}") + String getSysStaffOrgSidListByStaffSid(@Param("staffSid") String staffSid); + + String selectBySidPathByStaffSid(String applySid); + + @Select("select * from sys_staff_org where staffSid=#{staffSid} AND manageType != 2") + SysStaffOrg selectAllByStaffSid(String staffSid); + + @Select("select * from sys_staff_org where staffSid=#{sid} and manageType = '3' order by id limit 1") + SysStaffOrg getOrgByStaffSid(String sid); + + @Select("select * from sys_staff_org where staffSid=#{sid} and orgSidPath = #{path} ") + SysStaffOrg getOrgByStaffSidAndPath(@Param("sid") String sid, @Param("path") String path); + + @Select("select * from sys_staff_org where staffSid=#{sid}") + List getOrgByStaffSidList(String sid); + + @Delete("delete from sys_staff_org where orgSid=#{sid} and (manageType = 1 or manageType = 2)") + void delZGAndFGByOrgSid(String sid); + + int selectByStaffAndOrg(@Param("sid") String sid, @Param("staffSid") String zgStaffSid, @Param("type") String type); + + int deleteByStaffSidAndType(@Param("sid") String sid, @Param("staffSid") String zgStaffSid, @Param("type") String type); + + List selectByStaffS(String staffSid); + + List selectByOrgSid(String sid); + + String selectByUserSid(String userSid); + + List selectOrgBySid(@Param("orgPath") String orgPath, @Param("staffSid") String staffSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.xml new file mode 100644 index 00000000..86784aeb --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + delete + from sys_staff_org + where staffSid = #{staffSid} + and manageType = #{type} + and orgSidPath = #{sid} + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgRest.java new file mode 100644 index 00000000..01a2f723 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -0,0 +1,147 @@ +package com.yxt.supervise.portal.biz.sysstafforg; + +import com.yxt.anrui.portal.api.sysstafforg.*; +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 io.swagger.annotations.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgFeignFallback.java
+ * Class: SysStaffOrgRest
+ * Description: 员工部门关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "员工部门关联表") +@RestController +@RequestMapping("v1/sysstafforg") +public class SysStaffOrgRest implements SysStaffOrgFeign { + + @Autowired + private SysStaffOrgService sysStaffOrgService; + + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysStaffOrgService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysStaffOrgQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffOrgService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffOrgService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean> staffinfoList(@RequestBody SysStaffOrgQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffOrgService.staffinfoList(query); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysStaffOrgDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysStaffOrgService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysStaffOrgDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + sysStaffOrgService.updateBySid(dto.toMap(), sid); + return rb.success(); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysStaffOrgService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysStaffOrgVo vo = sysStaffOrgService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean> getSysStaffOrgListByStaffSid(String staffSid) { + List list = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid); + if (list.size() > 0) { + return new ResultBean>().success().setData(list); + } else { + return new ResultBean().fail().setMsg("该员工无部门").setData(list); + } + } + + @Override + public ResultBean getSysStaffOrgSidListByStaffSid(String staffSid) { + String orgSids = sysStaffOrgService.getSysStaffOrgSidListByStaffSid(staffSid); + if (StringUtils.isNotBlank(orgSids)) { + return new ResultBean().success().setData(orgSids); + } else { + return new ResultBean().fail().setMsg("该员工无部门").setData(""); + } + } + + @Override + public ResultBean selectSidPathByStaffSid(String applySid) { + return sysStaffOrgService.selectSidPathByStaffSid(applySid); + } + + @Override + public ResultBean getOrgSidBySid(String orgSid) { + ResultBean rb = ResultBean.fireFail(); + String orgPathSid = sysStaffOrgService.getOrgByOrgSid(orgSid); + return rb.success().setData(orgPathSid); + } + + @Override + public ResultBean getOrgByStaffSid(String staffSid) { + ResultBean rb = ResultBean.fireFail(); + SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSid(staffSid); + return rb.success().setData(sysStaffOrg); + } + + @Override + public ResultBean getOrgSidByPath(String orgPath) { + return sysStaffOrgService.getOrgSidByPath(orgPath); + } + + @Override + public ResultBean selectAllByStaffSid(String staffSid) { + return sysStaffOrgService.selectAllByStaffSid(staffSid); + } + + @Override + public ResultBean getPathSidByUserSid(String applySid) { + return sysStaffOrgService.getPathSidByUserSid(applySid); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgService.java new file mode 100644 index 00000000..3efd0497 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstafforg/SysStaffOrgService.java @@ -0,0 +1,306 @@ +package com.yxt.supervise.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.anrui.portal.api.sysorganization.SysOrganization; +import com.yxt.anrui.portal.api.sysstafforg.*; +import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; +import com.yxt.supervise.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.supervise.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; +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.Arrays; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgService.java
+ * Class: SysStaffOrgService
+ * Description: 员工部门关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysStaffOrgService extends MybatisBaseService { + + @Autowired + private SysOrganizationService sysOrganizationService; + @Autowired + private SysUserService sysUserService; + + public PagerVo listPage(PagerQuery pq) { + SysStaffOrgQuery 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(SysStaffOrgQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysStaffOrgQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getOrgSid())) { + qw.eq("orgSid", query.getOrgSid()); + } + + if (StringUtils.isNotBlank(query.getOrgName())) { + qw.eq("orgName", query.getOrgName()); + } + + if (StringUtils.isNotBlank(query.getStaffSid())) { + qw.eq("staffSid", query.getStaffSid()); + } + + if (StringUtils.isNotBlank(query.getOrgSidPath())) { + qw.eq("orgSidPath", query.getOrgSidPath()); + } + + if (query.getOrgNamePath() != null) { + qw.eq("orgNamePath", query.getOrgNamePath()); + } + + if (StringUtils.isNotBlank(query.getManageType())) { + qw.eq("manageType", query.getManageType()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysStaffOrgQuery 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(SysStaffOrgQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysStaffOrgDto dto) { + SysStaffOrg entity = new SysStaffOrg(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysStaffOrgVo fetchByIdVo(String id) { + SysStaffOrg entity = this.fetchById(id); + SysStaffOrgVo vo = new SysStaffOrgVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void delByOrgSid(String sid) { + baseMapper.delByOrgSid(sid); + } + + public List fetchByOrgSid(String orgSid) { + List list = baseMapper.fetchByOrgSid(orgSid); + return list; + } + + public void deleteByStaffSid(String staffSid) { + baseMapper.deleteByStaffSid(staffSid); + } + + public List staffinfoList(SysStaffOrgQuery query) { + QueryWrapper queryWrapper = createQueryWrapper(query); + List list = baseMapper.staffinfoList(queryWrapper); + return list; + } + + /** + * 根据员工sid部门信息 + * + * @param sid 员工sid + * @return + */ + public SysStaffOrg selectByStaffSid(String sid, String orgSid) { + return baseMapper.selectByStaffSid(sid, orgSid); + } + + /** + * 员工部门信息详情 + * + * @param sid 员工sid + * @return + */ + public SysStaffOrgDetailsVo selectByStaff(String sid, String orgSid) { + return baseMapper.selectByStaff(sid, orgSid); + } + + public SysStaffOrgDetailsVo selectByStaffByType(String sid, String orgSid, String type) { + return baseMapper.selectByStaffByType(sid, orgSid, type); + } + + public List getSysStaffOrgListByStaffSid(String staffSid) { + return baseMapper.getSysStaffOrgListByStaffSid(staffSid); + } + + public List getSysStaffOrgListByStaff(String staffSid) { + return baseMapper.getSysStaffOrgListByStaff(staffSid); + } + + public String getSysStaffOrgSidListByStaffSid(String staffSid) { + return baseMapper.getSysStaffOrgSidListByStaffSid(staffSid); + } + + /*public ResultBean selectSidPathByStaffSid(String applySid) { + ResultBean rb = ResultBean.fireFail(); + String orgSidPath = baseMapper.selectBySidPathByStaffSid(applySid); + //根据部门路径循环遍历查询分公司的sid + List list = Arrays.asList(orgSidPath.split("/")); + String sid = ""; + for (int i = 0; i < list.size(); i++) { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(list.get(i)); + if (sysOrganization != null) { + if (sysOrganization.getIsDept() != null) { + if (sysOrganization.getIsDept() == 0 && !"0".equals(sysOrganization.getPsid())) { + sid = list.get(i); + break; + } + } else { + if ("0".equals(sysOrganization.getPsid())) { + sid = list.get(i); + break; + } + } + } + } + if (StringUtils.isBlank(sid)) { + return rb; + } + return rb.success().setData(sid); + }*/ + public ResultBean selectSidPathByStaffSid(String applySid) { + ResultBean rb = ResultBean.fireFail(); + String orgSid = baseMapper.selectBySidPathByStaffSid(applySid); + String orgPathSid = ""; + if (StringUtils.isNotBlank(orgSid)) { + orgPathSid = getOrgByOrgSid(orgSid); + } + return rb.success().setData(orgPathSid); + } + + public ResultBean selectAllByStaffSid(String staffSid) { + ResultBean rb = ResultBean.fireFail(); + SysStaffOrg sysStaffOrg = baseMapper.selectAllByStaffSid(staffSid); + return rb.success().setData(sysStaffOrg); + } + + public SysStaffOrg getOrgByStaffSid(String sid) { + return baseMapper.getOrgByStaffSid(sid); + } + + public SysStaffOrg getOrgByStaffSidAndPath(String sid, String path) { + return baseMapper.getOrgByStaffSidAndPath(sid, path); + } + + public List getOrgByStaffSidList(String sid) { + return baseMapper.getOrgByStaffSidList(sid); + } + + /** + * 根据用户sid获取分公司sid + * + * @param applySid 用户sid + * @return + */ + public ResultBean getPathSidByUserSid(String applySid) { + ResultBean rb = ResultBean.fireFail(); + SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(applySid); + if (sysUserInfoVo == null) { + return rb; + } + ResultBean resultBean = selectSidPathByStaffSid(sysUserInfoVo.getStaffSid()); + return resultBean; + } + + public String getOrgByOrgSid(String orgSid) { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if(sysOrganization == null){ + return "0"; + } + if ("0".equals(sysOrganization.getPsid())) { + return "0"; + } + if (sysOrganization.getIsDept() == 0) { + return sysOrganization.getSid(); + } + return getOrgByOrgSid(sysOrganization.getPsid()); + + } + + public void delZGAndFGByOrgSid(String sid) { + baseMapper.delZGAndFGByOrgSid(sid); + } + + /** + * 查询该组织中是否存在该人员的该种类型关系 + * + * @param sid 组织机构sid + * @param zgStaffSid 人员sid + * @param type 主管、分管、员工 + * @return + */ + public int selectByStaffAndOrg(String sid, String zgStaffSid, String type) { + return baseMapper.selectByStaffAndOrg(sid, zgStaffSid, type); + } + + public int deleteByStaffSidAndType(String orgSid, String zgStaffSid, String type) { + return baseMapper.deleteByStaffSidAndType(orgSid, zgStaffSid, type); + } + + public List selectByStaffS(String staffSid) { + return baseMapper.selectByStaffS(staffSid); + } + + public List selectByOrgSid(String sid) { + return baseMapper.selectByOrgSid(sid); + } + + public String selectByUserSid(String userSid) { + return baseMapper.selectByUserSid(userSid); + } + + public List selectOrgBySid(String orgPath, String staffSid) { + return baseMapper.selectOrgBySid(orgPath, staffSid); + } + + public ResultBean getOrgSidByPath(String orgPath) { + ResultBean rb = ResultBean.fireFail(); + //根据用户全路径获取分公司sid + List stringList = Arrays.asList(orgPath.split("/")); + String orgSid = stringList.get(stringList.size() - 1); + orgPath = sysOrganizationService.getOrgSid(orgSid); + return rb.success().setData(orgPath); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.java new file mode 100644 index 00000000..a84d75c4 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.java @@ -0,0 +1,64 @@ +package com.yxt.supervise.portal.biz.sysstaffpost; + +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.anrui.portal.api.sysstaffpost.SysStaffPost; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostMapper.java
+ * Class: SysStaffPostMapper
+ * Description: 员工岗位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysStaffPostMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from sys_staff_post") + List selectListVo(); + + @Delete("delete from sys_staff_post where staffSid=#{staffSid} ") + void deleteByStaffSid(String staffSid); + + /** + * 根据员工sid查询员工的岗位信息 + * + * @param sid 员工的sid + * @return + */ + SysStaffPost selectByStaffSid(@Param("sid") String sid, @Param("postSid") String postSid); + + /** + * 员工岗位信息详情 + * + * @param sid 员工sid + * @return + */ + SysStaffPostDetailsVo selectByStaff(@Param("sid") String sid, @Param("postSid") String postSid); + + SysStaffPostDetailsVo getPostByStaffSid(String sid); + + String selectPost(String sid); + + List getPost(String staffSid); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.xml new file mode 100644 index 00000000..69281539 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostRest.java new file mode 100644 index 00000000..70c29685 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostRest.java @@ -0,0 +1,110 @@ +package com.yxt.supervise.portal.biz.sysstaffpost; + +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostQuery; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostVo; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.supervise.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 io.swagger.annotations.Api; +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 javax.servlet.http.HttpServletRequest; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostFeignFallback.java
+ * Class: SysStaffPostRest
+ * Description: 员工岗位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "员工岗位关联表") +@RestController +@RequestMapping("v1/sysstaffpost") +public class SysStaffPostRest implements SysStaffPostFeign { + @Autowired + private RedisUtil redisUtil; + @Autowired + private SysStaffPostService sysStaffPostService; + @Autowired + private SysUserService sysUserService; + @Autowired(required = false) + private HttpServletRequest httpServletRequest; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysStaffPostService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysStaffPostQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffPostService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysStaffPostService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysStaffPostDto dto) { + ResultBean rb = ResultBean.fireFail(); + sysStaffPostService.saveOrUpdateDto(dto); + String token = httpServletRequest.getHeader("token"); + String s = redisUtil.get(token); + SysUser sysUser = sysUserService.fetchByUserName(s); + return rb.success(); + } + + @Override + public ResultBean update(SysStaffPostDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + sysStaffPostService.updateBySid(dto.toMap(), sid); + return rb.success(); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysStaffPostService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysStaffPostVo vo = sysStaffPostService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean selectPost(String sid) { + ResultBean rb = ResultBean.fireFail(); + String s = sysStaffPostService.selecctPost(sid); + if(StringUtils.isBlank(s)){ + return rb.setMsg("操作失败"); + } + return rb.success().setData(s); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostService.java new file mode 100644 index 00000000..0aeea3f3 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysstaffpost/SysStaffPostService.java @@ -0,0 +1,142 @@ +package com.yxt.supervise.portal.biz.sysstaffpost; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysstaffpost.*; +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 org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffPostService.java
+ * Class: SysStaffPostService
+ * Description: 员工岗位关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysStaffPostService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SysStaffPostQuery 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(SysStaffPostQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysStaffPostQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getStaffSid())) { + qw.eq("staffSid", query.getStaffSid()); + } + + if (StringUtils.isNotBlank(query.getOrgSid())) { + qw.eq("orgSid", query.getOrgSid()); + } + + if (StringUtils.isNotBlank(query.getPostSid())) { + qw.eq("postSid", query.getPostSid()); + } + + if (query.getStartDateStart() != null) { + qw.ge("startDate", query.getStartDateStart()); + } + if (query.getStartDateEnd() != null) { + qw.le("startDate", query.getStartDateEnd()); + } + + if (query.getIsDepetHead() != null) { + qw.eq("isDepetHead", query.getIsDepetHead()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysStaffPostQuery 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(SysStaffPostQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysStaffPostDto dto) { + SysStaffPost entity = new SysStaffPost(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysStaffPostVo fetchByIdVo(String id) { + SysStaffPost entity = this.fetchById(id); + SysStaffPostVo vo = new SysStaffPostVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByStaffSid(String staffSid) { + baseMapper.deleteByStaffSid(staffSid); + } + + /** + * 根据员工sid查询员工的岗位信息 + * + * @param sid 员工sid + * @return + */ + public SysStaffPost selectByStaffSid(String sid, String postSid) { + return baseMapper.selectByStaffSid(sid, postSid); + } + + /** + * 员工岗位详情信息 + * + * @param sid 员工sid + * @return + */ + public SysStaffPostDetailsVo selectByStaff(String sid, String postSid) { + return baseMapper.selectByStaff(sid, postSid); + } + + public SysStaffPostDetailsVo getPostByStaffSid(String sid) { + return baseMapper.getPostByStaffSid(sid); + } + + public String selecctPost(String sid) { + return baseMapper.selectPost(sid); + } + + public List getPost(String staffSid) { + return baseMapper.getPost(staffSid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.java new file mode 100644 index 00000000..2470252f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.java @@ -0,0 +1,187 @@ +package com.yxt.supervise.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.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.portal.api.sysuser.wx.WxHomePageVo; +import com.yxt.anrui.portal.api.sysuser.wx.WxMySysUserInfoVo; +import com.yxt.anrui.portal.api.sysuser.wx.WxSysUserVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; +import java.util.Map; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserMapper.java
+ * Class: SysUserMapper
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysUserMapper extends BaseMapper { + + //@Update("update sys_user set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper ew, @Param("orgName") String orgName,@Param("userName") String userName); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("SELECT user.*,staff.name FROM sys_user user left join sys_staffinfo staff on user.staffSid=staff.sid where user.isDelete=0") + List selectListVo(); + + public int updatePassword(String sid, String password); + + public int updatePasswordApp(String sid, String password); + + SysUser selectByUserName(String userName); + + SysUser selectByUserNameApp(String userName); + + SysUser selectByAppId(String appId); + + @Update("UPDATE sys_user SET appId=#{appId} WHERE sid=#{sid} and userType=1") + int updateAppId(@Param("sid") String sid, @Param("appId") String appId); + + @Update("UPDATE sys_user SET token=#{token} WHERE sid=#{sid}") + int updateToken(@Param("sid") String sid, @Param("token") String token); + + SysUser fetchByUserName(String userName); + + void delBySid(String sid); + + @Update("UPDATE sys_user SET headImage=#{headImage} WHERE sid=#{sid}") + int updateHeadImage(@Param("sid") String sid, @Param("headImage") String headImage); + + /** + * @param mobile 手机号 + * @param userType 用户类型 + * @description: 根据手机号和用户类型查询客户是否存在 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 11:35 + */ + SysUser selectByMobileAndType(@Param("mobile") String mobile, @Param("userType") int userType); + + /** + * @param userSid 用户sid + * @description: 根据用户sid查询用户头像和姓名 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 11:36 + */ + WxMySysUserInfoVo selectMyInfo(String userSid); + + /** + * @param userName 用户名 + * @description: 根据用户名查询登录信息 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 15:10 + */ + WxSysUserVo selectByWxUserName(@Param("userName") String userName, @Param("userType") int userType); + + // @Select("SELECT * FROM sys_user WHERE staffSid=#{staffSid} and isDelete=0") + SysUserVo selectByStaffsid(@Param("staffSid") String staffSid); + + /** + * @param userSid 用户sid + * @description: 根据用户sid查询客户端首页 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/12 11:31 + */ + WxHomePageVo selectHomePage(String userSid); + + @Update("update sys_user set isDelete=1 where isDelete=0 and userType=2 and userName=#{mobile}") + int delSysUserByMobile(@Param("mobile") String mobile); + + @Select("select sid from sys_user") + List selectAllUserSid(); + + @Select("select * from sys_staffinfo where sid = #{staffSid}") + SysStaffinfoVo getSysUserByMobile(String staffSid); + + AppUserOrgInfoVo getUserOrgInfoByUserSid(@Param("userSid") String userSid); + + /** + * 根据用户sid查询用户的组织信息 + * + * @param userSid 用户的sid + * @return + */ + SysUserInfoVo selectUserInfoByUserSid(String userSid); + SysUserInfoVo selectUserInfoByUserSidOne(@Param("userSid") String userSid,@Param("orgSid") String orgSid); + + /** + * 根据员工sid更新用户的工号以及手机号 + * + * @param jobNumber 员工工号 + * @param mobile 手机号 + * @param sid 员工sid + * @return + */ + int updateByStaffSid(@Param("jobNumber") String jobNumber, @Param("mobile") String mobile, @Param("sid") String sid); + + /** + * 根据员工sid更新用户中的员工工号 + * + * @param jobNumber 员工工号 + * @param sid 员工sid + * @return + */ + int updateByStaSid(@Param("jobNumber") String jobNumber, @Param("sid") String sid); + + /** + * 根据手机号查询用户是否存在 + * + * @param mobile 手机号 + * @return + */ + SysUser selectByMobile(String mobile); + + int updateIsEnable(@Param("sid") String sid, @Param("isEnable") String isEnable); + + List getUsersByRoleSid(@Param("roleSid") String roleSid); + + List getUserByRole(@Param("roleSid") String roleSid, @Param("levelOrgSid") String levelOrgSid); + + List> getUserByOrgSid(@Param("orgSid") String orgSid,@Param("userSid") String userSid); + + List fetchBySids(@Param("sids")List sids); + + List getUserByRoleSid(String roleSid); + + /** + * 根据手机号解绑用户绑定的设备 + * @param mobile + * @return + */ + int updateAppIdByMobile(String mobile); + + /** + * 解绑所有用户绑定的设备 + * @return + */ + int updateAppIdAll(); + + String selectIdBySid(@Param("list") List stringList); + + List getUserMessageByRole(@Param("roleSid") String roleSid,@Param("levelOrgSid") String levelOrgSid, @Param("list") List stringList); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.xml new file mode 100644 index 00000000..6a07f148 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserMapper.xml @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + update sys_user + set password=#{param2} + where sid = #{param1} + + + update sys_user + set password=#{param2} + where sid = #{param1} + and userType = 1 + + + delete + from sys_user + where sid = #{param1} + + + + + + + + + + + + + + + + + + + update sys_user + set userName = #{jobNumber}, + mobile = #{mobile} + where staffSid = #{sid} + + + + update sys_user + set userName = #{jobNumber} + where staffSid = #{sid} + + + + + + UPDATE sys_user + SET isEnable = #{isEnable} + WHERE sid = #{sid} + + + + + + + + + + + + + + update sys_user + set appId = NULL + where mobile = #{mobile} + + + + update sys_user + set appId = NULL + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserRest.java new file mode 100644 index 00000000..adefcdd6 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserRest.java @@ -0,0 +1,550 @@ +package com.yxt.supervise.portal.biz.sysuser; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.portal.api.sysorganization.SysOrganization; +import com.yxt.anrui.portal.api.syspost.SysPost; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost; +import com.yxt.anrui.portal.api.sysuser.*; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.supervise.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.supervise.portal.biz.syspost.SysPostService; +import com.yxt.supervise.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.supervise.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.supervise.portal.biz.sysstaffpost.SysStaffPostService; +import com.yxt.common.base.config.RedisUtil; +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 io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; +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 javax.servlet.http.HttpServletRequest; +import java.util.*; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserFeignFallback.java
+ * Class: SysUserRest
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "用户表") +@RestController +@RequestMapping("v1/sysuser") +public class SysUserRest implements SysUserFeign { + @Autowired + private RedisUtil redisUtil; + @Autowired + private SysUserService sysUserService; + @Autowired + private SysStaffinfoService sysStaffinfoService; + @Autowired + private SysStaffOrgService sysStaffOrgService; + @Autowired + private SysStaffPostService sysStaffPostService; + @Autowired + private SysOrganizationService sysOrganizationService; + @Autowired + private SysPostService sysPostService; + @Autowired + private HttpServletRequest httpServletRequest; + // 定义点选文字图片验证码允许的误差值 + private static final int ERROR_AMOUNT = 50;// 定义允许的误差值，单位是px + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail();//roleSid + PagerVo pv = sysUserService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysUserQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = sysUserService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = sysUserService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysUserDto dto) { + ResultBean rb = ResultBean.fireFail(); + //手机号 + String mobile = dto.getMobile(); + //姓名 + String name = dto.getName(); + //用户类型 + int userType = dto.getUserType(); + //部门sid + String deptSid = dto.getDeptSid(); + //岗位sid + String postSid = dto.getPostSid(); + //验证码 + String verificationCode = dto.getVerificationCode(); + + if (StringUtils.isBlank(mobile)) { + return new ResultBean().fail().setMsg("手机号不能为空"); + } else { + SysUser one = sysUserService.fetchByUserName(mobile); + if (null != one) { + return new ResultBean().fail().setMsg("手机号重复!`"); + } + } + if (StringUtils.isBlank(name)) { + return new ResultBean().fail().setMsg("姓名不能为空"); + } + if (userType == 0) { + return new ResultBean().fail().setMsg("用户类型不能为空"); + } + if (StringUtils.isBlank(verificationCode)) { + return new ResultBean().fail().setMsg("验证码不能为空"); + } else { + Map stringObjectMap = sysUserService.mobileValidateRegister(mobile, verificationCode); + String code = stringObjectMap.get("code").toString(); + String details = stringObjectMap.get("details").toString(); + if (Tools.CODE_FAIL.equals(code)) { + return ResultBean.fireFail().setMessage(details).setMsg(details); + } + } + //"15097329653"; + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + SysStaffinfo ssi = new SysStaffinfo(); + SysUser su = new SysUser(); + dto.fillEntity(su); + su.setStaffSid(ssi.getSid()); + su.setUserName(mobile); + su.setPassword(md5); + su.setIsAdmin("1"); + sysUserService.save(su); + ssi.setName(name); + ssi.setMobile(mobile); + ssi.setPinYinName(PinYinUtils.getPinYinName(name)); + ssi.setFirstPinYinLabel(PinYinUtils.getCharDuoPinYinChar(name)); + sysStaffinfoService.save(ssi); + if (StringUtils.isNotBlank(deptSid)) { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(deptSid); + SysStaffOrg sso = new SysStaffOrg(); + sso.setOrgName(sysOrganization.getName()); + sso.setOrgSid(sysOrganization.getSid()); + sso.setStaffSid(ssi.getSid()); + sso.setOrgSidPath(sysOrganization.getOrgSidPath()); + sso.setOrgNamePath(sysOrganization.getName()); + sso.setManageType("3"); + sysStaffOrgService.save(sso); + } + if (StringUtils.isNotBlank(postSid)) { + SysPost sysPost = sysPostService.fetchBySid(postSid); + SysStaffPost ssp = new SysStaffPost(); + ssp.setStaffSid(ssi.getSid()); + ssp.setOrgSid(deptSid); + ssp.setPostSid(postSid); + ssp.setStartDate(new Date()); + ssp.setIsDepetHead(0); + sysStaffPostService.save(ssp); + } + return rb.success(); + } + + @Override + public ResultBean delSysUserByMobile(String mobile) { + int i = sysUserService.delSysUserByMobile(mobile); + if (i == 0) { + return new ResultBean().fail().setMsg("删除失败"); + } + return new ResultBean().success().setMsg("删除成功"); + } + + @Override + public ResultBean getSysUserByMobile(String staffSid) { + ResultBean rb = ResultBean.fireFail(); + SysStaffinfoVo user = sysUserService.getSysUserByMobile(staffSid); + return rb.success().setData(user); + } + + @Override + public ResultBean update(SysUserDto dto, String sid) { + ResultBean rb = ResultBean.fireFail(); + sysUserService.updateBySid(dto.toMap(), sid); + //部门sid + String deptSid = dto.getDeptSid(); + //岗位sid + String postSid = dto.getPostSid(); + SysUser sysUser = sysUserService.fetchBySid(sid); + SysStaffinfo ssi = sysStaffinfoService.fetchBySid(sysUser.getStaffSid()); + ssi.setMobile(dto.getMobile()); + ssi.setName(dto.getName()); + sysStaffinfoService.updateById(ssi); + if (StringUtils.isNotBlank(deptSid)) { + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(deptSid); + sysStaffOrgService.deleteByStaffSid(sysUser.getStaffSid()); + SysStaffOrg sso = new SysStaffOrg(); + sso.setOrgName(sysOrganization.getName()); + sso.setOrgSid(sysOrganization.getSid()); + sso.setStaffSid(ssi.getSid()); + sso.setOrgSidPath(sysOrganization.getOrgSidPath()); + sso.setOrgNamePath(sysOrganization.getName()); + sso.setManageType("3"); + sysStaffOrgService.save(sso); + } + if (StringUtils.isNotBlank(postSid)) { + SysPost sysPost = sysPostService.fetchBySid(postSid); + sysStaffPostService.deleteByStaffSid(sysUser.getStaffSid()); + SysStaffPost ssp = new SysStaffPost(); + ssp.setStaffSid(ssi.getSid()); + ssp.setOrgSid(deptSid); + ssp.setPostSid(postSid); + ssp.setStartDate(new Date()); + ssp.setIsDepetHead(0); + sysStaffPostService.save(ssp); + } + return rb.success(); + } + + /** + * 修改密码(★) + * + * @param original 原始密码 + * @param password 密码 + * @param confirmPassword 确认密码 + * @return + */ + @Override + public ResultBean updatePassword(String original, String password, String confirmPassword, String userSid, HttpServletRequest httpServletRequest) { + String token = httpServletRequest.getHeader("token"); + // 根据redisToken查询用户信息 + SysUser user = sysUserService.fetchBySid(userSid); + if (user == null) { + return ResultBean.fireFail().setMsg("抱歉，用户不存在"); + } + if (!password + .matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { + return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); + } + String newPassword = Encodes.md5(original); + if (!newPassword.equals(user.getPassword())) { + return ResultBean.fireFail().setMsg("原始密码输入错误"); + } + if (!password.equals(confirmPassword)) { + return ResultBean.fireFail().setMsg("密码和确认密码不一致"); + } + int i = sysUserService.updatePassword(user.getSid(), Encodes.md5(password)); + if (i == 0) { + return ResultBean.fireFail().setMsg("修改失败"); + } + redisUtil.remove(token); + return ResultBean.fireSuccess().setMsg("修改成功"); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + sysUserService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean delBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + sysUserService.delBySid(sid); + return rb.success(); + } + + @Override + public ResultBean selectByUserName(String mobile) { + SysUser user = sysUserService.selectByUserName(mobile); + SysUserVo sysUserVo = new SysUserVo(); + BeanUtil.copyProperties(user, sysUserVo); + return new ResultBean().success().setData(sysUserVo); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + SysUserVo vo = sysUserService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysUserVo vo = sysUserService.fetchBySidVo(sid); + return rb.success().setData(vo); + } + + @Override + public ResultBean> fetchBySids(String sids) { + ResultBean rb = ResultBean.fireFail(); + List vo = sysUserService.fetchBySidSVo(sids); + return rb.success().setData(vo); + } + + @Override + public ResultBean reGetPwd(String userName, String userPhone) { + return sysUserService.reGetPwd(userName, userPhone); + } + + @Override + public ResultBean initPwd(String sid) { + if (!sysUserService.initPwd(sid)) { + return ResultBean.fireFail().setMsg("初始化密码失败"); + } + return ResultBean.fireSuccess().setMsg("初始化密码成功"); + } + + @Override + public ResultBean login(SysUserQuery userQuery) { + String userName = userQuery.getUserName(); + String password = userQuery.getPassword(); + + + // 遍历其中的map，取出每个属性值 + + boolean isCorrect = false; + + if (StringUtils.isBlank(userName)) { + return new ResultBean().fail().setMsg("用户名不能为空"); + } + if (StringUtils.isBlank(password)) { + return new ResultBean().fail().setMsg("密码不能为空"); + } + SysUser user = null; + // 验证通过之后删除redis上的验证过的该条uuid + user = sysUserService.selectByUserName(userName); + String md5 = Encodes.md5(password); + if (user == null) { + //根据手机号查询用户是否存在 + user = sysUserService.selectByMobile(userName); + if (user == null) { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } else { + if (!md5.equals(user.getPassword())) { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } + } else { + if (!(md5.equals(user.getPassword()))) { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } + // 根据用户信息查询用户的角色信息 + SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user); + if (userInfoOneVo == null) { + return new ResultBean().fail().setMsg("该用户不是公司员工"); + } + return new ResultBean().success().setData(userInfoOneVo); + } + + @Override + public ResultBean loginByNoVeriCode(SysUserQuery userQuery) { + + String userName = userQuery.getUserName(); + String password = userQuery.getPassword(); + if (StringUtils.isBlank(userName)) { + return new ResultBean().fail().setMsg("用户名不能为空"); + } + if (StringUtils.isBlank(password)) { + return new ResultBean().fail().setMsg("密码不能为空"); + } + SysUser user = null; + // 验证通过之后删除redis上的验证过的该条uuid + user = sysUserService.selectByUserName(userName); + String md5 = Encodes.md5(password); + if (user == null) { + //根据手机号查询用户是否存在 + user = sysUserService.selectByMobile(userName); + if (user == null) { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } else { + if (!md5.equals(user.getPassword())) { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } + } else { + if (!(md5.equals(user.getPassword()))) { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } + // 根据用户信息查询用户的角色信息 + SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user); + if (userInfoOneVo == null) { + return new ResultBean().fail().setMsg("该用户不是公司员工"); + } + return new ResultBean().success().setData(userInfoOneVo); + + } + + @Override + public ResultBean signOut(HttpServletRequest httpServletRequest) { + String token = httpServletRequest.getHeader("token"); + String redisToken = redisUtil.get(token); + if (StringUtils.isBlank(redisToken)) { + return ResultBean.fireSuccess().setMsg("您已退出，请刷新"); + } + redisUtil.remove(token); + return ResultBean.fireSuccess().setMsg("退出成功"); + } + + /** + * 获取验证码（注册）(★) + * + * @param mobile 手机号 + * @return ResultBean + */ + @Override + public ResultBean sendMessageCode(String mobile) { + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { + return new ResultBean().fail().setMsg("请输入正确的手机号"); + } + String verificationCode = ""; + return sysUserService.getVerificationCode(mobile, verificationCode); + } + + @Override + public ResultBean selectByStaffsid(String staffsid) { + SysUserVo user = sysUserService.selectByStaffsid(staffsid); + if (user != null) { + return new ResultBean().success().setData(user); + } else { + return new ResultBean().fail().setData(new SysUserVo()).setMsg("查无此用户"); + } + + } + + @Override + public ResultBean selectBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysUser vo = sysUserService.fetchBySid(sid); + if (vo == null) { + vo = new SysUser(); + return rb.fail().setData(vo).setMsg("用户不存在"); + } + return rb.success().setData(vo); + } + + @Override + public ResultBean loginDetails(HttpServletRequest httpServletRequest) { + String token = httpServletRequest.getHeader("token"); + if (StringUtils.isBlank(token)) { + return new ResultBean().fail().setMsg("请重新登录"); + } + String userName = redisUtil.get(token); + if (StringUtils.isBlank(userName)) { + return new ResultBean().fail().setMsg("请重新登录"); + } + SysUser user = sysUserService.selectByUserName(userName); + SysUserVo userInfoOneVo = sysUserService.selectUserOne(user); + if (userInfoOneVo == null) { + return new ResultBean().fail().setMsg("该用户不是公司员工"); + } + return new ResultBean().success().setData(userInfoOneVo); + } + + @Override + public ResultBean getUserOrgInfoByUserSid(String userSid) { + AppUserOrgInfoVo vo = sysUserService.getUserOrgInfoByUserSid(userSid); + if (vo == null) { + return new ResultBean().fail().setMsg("查询失败"); + } + return new ResultBean().success().setData(vo); + } + + /** + * 根据用户的sid查询该用户的组织信息 + * + * @param userSid 用户sid + * @return + */ + @Override + public ResultBean selectUserInfoByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid); + if (sysUserInfoVo == null) { + return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门"); + } + return rb.success().setData(sysUserInfoVo); + } + + @Override + public ResultBean selectUserInfoByUserSid(String userSid, String orgSid) { + ResultBean rb = ResultBean.fireFail(); + SysUserInfoVo sysUserInfoVo = sysUserService.selectUserInfoByUserSid(userSid,orgSid); + if (sysUserInfoVo == null) { + return rb.setData(new SysUserInfoVo()).setMsg("该用户未设置所属部门"); + } + return rb.success().setData(sysUserInfoVo); + } + + @Override + public ResultBean setIsEnable(String sid, String isEnable) { + SysUser sysUser = sysUserService.fetchBySid(sid); + if (sysUser == null) { + return ResultBean.fireFail().setMsg("此角色已不存在"); + } + int i = sysUserService.updateIsEnable(sid, isEnable); + if (i == 0) { + return ResultBean.fireFail().setMsg("设置失败"); + } + return ResultBean.fireSuccess().setMsg("设置成功"); + } + + @Override + public ResultBean getUsersByRoleSid(String roleSid) { + return sysUserService.getUsersByRoleSid(roleSid); + } + + @Override + public ResultBean> getUserByRole(UserQuery query) { + return sysUserService.getUserByRole(query); + } + + @Override + public ResultBean> getUserByOrgRole(UserRoleQuery query) { + return sysUserService.getUserByOrgRole(query); + } + + @Override + public ResultBean> getOtherOrgRoleUser(UserRoleQuery query) { + return sysUserService.getOtherOrgRoleUser(query); + } + + @Override + public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { + return sysUserService.getUserByOrgSid(orgSid, userSid); + } + + @Override + public ResultBean selectIdBySid(List stringList) { + return sysUserService.selectIdBySid(stringList); + } + + @Override + public ResultBean> selectSysUserList(String userSid) { + return sysUserService.selectSysUserList(userSid); + } + + @Override + public ResultBean selectPasswordByUserSid(String userSid) { + return sysUserService.selectPasswordByUserSid(userSid); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserService.java new file mode 100644 index 00000000..c9625405 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/SysUserService.java @@ -0,0 +1,1124 @@ +package com.yxt.supervise.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.anrui.portal.api.sysorganization.SysOrganization; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo; +import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo; +import com.yxt.anrui.portal.api.sysuser.*; +import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; +import com.yxt.anrui.portal.api.sysuser.app.OrgList; +import com.yxt.anrui.portal.api.sysuser.wx.WxHomePageVo; +import com.yxt.anrui.portal.api.sysuser.wx.WxMySysUserInfoVo; +import com.yxt.anrui.portal.api.sysuser.wx.WxSysUserVo; +import com.yxt.supervise.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.supervise.portal.biz.sysrole.SysRoleService; +import com.yxt.supervise.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.supervise.portal.biz.sysstafforg.SysStaffOrgService; +import com.yxt.supervise.portal.biz.sysstaffpost.SysStaffPostService; +import com.yxt.common.base.config.RedisUtil; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.config.component.ImageUploadUtil; +import com.yxt.common.base.service.MybatisBaseService; +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.supervise.portal.config.DictCommonType; +import org.apache.ibatis.annotations.Param; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.util.*; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; + +import static java.util.concurrent.Executors.newScheduledThreadPool; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserService.java
+ * Class: SysUserService
+ * Description: 用户表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysUserService extends MybatisBaseService { + + /** + * 设置redis的过期时间为4小时 + */ + public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600; + public static final long USERS_REDIS_SESSION_TL_App = 24 * 15 * 3600; + /** + * 验证码长度 + */ + static final int LENGTH_OF_CODE = 4; + /** + * 调用发送短信接口返回值 + */ + static final String RESULT_CODE = "1"; + /** + * 手机短信登录验证码时效(秒) + */ + static final long APP_LOGIN_CODE_TIME_LIMIT = 300L; + @Autowired + private SysStaffinfoService sysStaffinfoService; + @Autowired + private SysStaffOrgService sysStaffOrgService; + @Autowired + private RedisUtil redisUtil; + + @Autowired + private SysOrganizationService sysOrganizationService; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private SysStaffPostService sysStaffPostService; + + @Autowired + private ImageUploadUtil imageUploadUtil; + @Autowired + private SysRoleService sysRoleService; + + + public PagerVo listPage(PagerQuery pq) { + SysUserQuery 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(SysUserQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + + private QueryWrapper createQueryWrapper(SysUserQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + 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"); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysUserQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + String deptName = ""; + String userName = ""; + if (StringUtils.isNotBlank(query.getOrgName())) { + deptName = query.getOrgName().trim(); + } + if (StringUtils.isNotBlank(query.getUserName())) { + userName = query.getUserName().trim(); + } + IPage pagging = baseMapper.selectPageVo(page, qw, deptName, userName); + List records = pagging.getRecords(); + for (SysUserVo record : records) { + String departmentSid = record.getDepartmentSid(); + String orgName = ""; + if (StringUtils.isNotBlank(departmentSid)) { + String[] split = departmentSid.split(","); + for (String s : split) { + //获取本级sid获取本级部门信息 + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(s); + //从本级部门信息中获取上级sid + String psid = sysOrganization.getPsid(); + //从本级部门信息中获取本级部门名称 + String bjName = sysOrganization.getName(); + //获取上级sid获取上级部门信息 + SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(psid); + //从上级部门信息中获取上级部门名称 + String sjName = sysOrganization1.getName(); + orgName += sjName + "-" + bjName + ","; + } + orgName = orgName.substring(0, orgName.length() - 1); + record.setDepartmentName(orgName); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(SysUserQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysUserDto dto) { + SysUser entity = new SysUser(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysUserVo fetchByIdVo(String id) { + SysUser entity = this.fetchById(id); + SysUserVo vo = new SysUserVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public SysUserVo fetchBySidVo(String sid) { + SysUser entity = this.fetchBySid(sid); + String staffSid = entity.getStaffSid(); + SysStaffinfo sysStaffinfo = sysStaffinfoService.fetchBySid(staffSid); + SysUserVo vo = new SysUserVo(); + BeanUtil.copyProperties(entity, vo); + vo.setName(sysStaffinfo.getName()); + vo.setJobNumber(sysStaffinfo.getJobNumber()); + List orgVoList = sysStaffOrgService.getSysStaffOrgListByStaffSid(staffSid); + if (orgVoList.size() > 0) { // 手机端销售人员用到orgsid,目前按唯一算 + SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0); + vo.setOrganizationSid(sysStaffOrgVo.getOrgSid()); + vo.setOrganizationName(sysStaffOrgVo.getOrgName()); + } + return vo; + } + + /** + * 初始化密码,给用户发送手机短信 + * + * @param sid 用户sid + * @return ResultBean + */ + public Boolean initPwd(String sid) { + SysUser user = this.fetchBySid(sid); + if (null == user) { + return false; + } + String mobile = user.getMobile(); + + String substring = mobile.substring(5, 11); + // 1.生成新密码 + /*String newPwd = StringRandom.getRandomString(8);*/ + // 2.加密密码，更新用户密码 + if (0 == updatePassword(user.getSid(), Encodes.md5(substring))) { + return false; + } + redisUtil.remove(user.getUserName()); + // 3.给用户发送手机短信 + return true; + } + + public int updatePassword(String sid, String password) { + return baseMapper.updatePassword(sid, password); + } + + public ResultBean updatePasswordApp(SysUser user, String oldPassword, String newPassword, String token) { + ResultBean rb = ResultBean.fireFail(); + String oldPasswordMd5 = Encodes.md5(oldPassword); + if (!oldPasswordMd5.equals(user.getPassword())) { + return rb.setMsg("原始密码输入错误"); + } + if (!newPassword.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,16}$")) { + return rb.setMsg("密码格式错误，必须为8至16位大小写字母和数字的组合"); + } + int i = baseMapper.updatePasswordApp(user.getSid(), Encodes.md5(newPassword)); + SysUserVo sysUserVo = selectUserOne(user); + if (sysUserVo == null) { + sysUserVo = new SysUserVo(); + } else { + //查询是否需要更换密码 + boolean isTrue = false; + String mobile = user.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + if (user.getPassword().equals(md5)) { + isTrue = true; + } + } + sysUserVo.setNeedResetPsd(isTrue); + } + if (i == 1) { +// redisUtil.remove(token); + return rb.success().setData(sysUserVo); + } else { + return rb.setMsg("修改失败"); + } + } + + public SysUser selectByUserName(String userName) { + return baseMapper.selectByUserName(userName); + } + + public SysUser selectByUserNameApp(String userName) { + return baseMapper.selectByUserNameApp(userName); + } + + public SysUser selectByAppId(String appId) { + return baseMapper.selectByAppId(appId); + } + + public int updateAppId(String sid, String appId) { + return baseMapper.updateAppId(sid, appId); + } + + public int updateToken(String sid, String token) { + return baseMapper.updateToken(sid, token); + } + + public SysUserVo setUserRedisSessionToken(SysUser user) { + // 生成token + String uniqueToken = JWTUtil.create(user.getSid() + ""); + // redis中缓存token + redisUtil.set(uniqueToken, user.getUserName(), + USERS_REDIS_SESSION_TL_PC); + SysUserVo userInfoOneVo = selectUserOne(user); + if (userInfoOneVo == null) { + return userInfoOneVo; + } else { + userInfoOneVo.setToken(uniqueToken); + return userInfoOneVo; + } + + } + + //公共的方法 + public SysUserVo selectUserOne(SysUser user) { + // 根据用户信息查询用户的角色信息 + SysUserVo userInfoOneVo = new SysUserVo(); + userInfoOneVo.setToken(user.getToken()); + userInfoOneVo.setId(user.getId()); + userInfoOneVo.setSid(user.getSid()); + userInfoOneVo.setUserName(user.getUserName()); + userInfoOneVo.setIsAdmin(user.getIsAdmin()); + //类型为员工的组织机构信息 + SysStaffOrg sysStaffOrg = sysStaffOrgService.selectAllByStaffSid(user.getStaffSid()).getData(); + if (sysStaffOrg == null) { + return null; + } + + userInfoOneVo.setRoleName(""); + String dwjb = ""; + // 系统管理员（没有对应的人员和单位） + //是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员 + if ("0".equals(user.getIsAdmin())) { + userInfoOneVo.setName("系统管理员"); + userInfoOneVo.setMobile(""); + userInfoOneVo.setStaffSid(""); + userInfoOneVo.setOrganizationName("无单位"); + userInfoOneVo.setDepartmentName("无部门"); + } else { + // 获取人员姓名 + SysStaffinfo staffVo = sysStaffinfoService.fetchBySid(user.getStaffSid()); + if (null != staffVo) { + userInfoOneVo.setName(staffVo.getName()); + userInfoOneVo.setMobile(staffVo.getMobile()); + userInfoOneVo.setStaffSid(staffVo.getSid()); +// userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath()); +// userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath()); + + } + // 尚无单位人员，没有单位和部门信息 + if ("3".equals(user.getIsAdmin())) { + userInfoOneVo.setOrganizationName("无单位"); + userInfoOneVo.setDepartmentName("无部门"); + } else { + userInfoOneVo.setOrganizationName("无单位"); + userInfoOneVo.setDepartmentName("无部门"); + List orgVoList = sysStaffOrgService.getSysStaffOrgListByStaff(user.getStaffSid()); + SysStaffPostDetailsVo staffPostDetailsVo = sysStaffPostService.getPostByStaffSid(user.getStaffSid()); + userInfoOneVo.setPostSid(staffPostDetailsVo.getPostSid()); + userInfoOneVo.setPostName(staffPostDetailsVo.getName()); + if (orgVoList.size() > 0) { + //类型为员工的组织机构信息 + SysStaffOrgVo sysStaffOrgVo = orgVoList.get(0); + userInfoOneVo.setDepartmentName(sysStaffOrgVo.getOrgName()); + userInfoOneVo.setDepartmentSid(sysStaffOrgVo.getOrgSid()); + SysOrganization sysOrganizationOne = sysOrganizationService.fetchBySid(sysStaffOrgVo.getOrgSid()); + if (sysOrganizationOne != null) { + String psid = sysOrganizationOne.getPsid(); + String name = sysOrganizationService.fetchBySid(psid).getName(); + userInfoOneVo.setPNameAndDepartmentNameAndPostName(name + "-" + sysStaffOrgVo.getOrgName()); + } + userInfoOneVo.setOrganizationSid(sysStaffOrgVo.getOrgSid()); + userInfoOneVo.setOrganizationName(sysStaffOrgVo.getOrgName()); + userInfoOneVo.setOrgNamePath(sysStaffOrg.getOrgNamePath()); + userInfoOneVo.setOrgSidPath(sysStaffOrg.getOrgSidPath()); + //根据orgSidPath查询分公司sid===== + userInfoOneVo.setDefaultOrgPath(sysStaffOrg.getOrgSidPath()); + userInfoOneVo.setDefaultOrgPathName(sysStaffOrg.getOrgNamePath()); + /* String orgSid = sysStaffOrgService.getOrgByOrgSid(sysStaffOrgVo.getOrgSid()); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if (sysOrganization != null) { + userInfoOneVo.setDefaultOrgPathName(sysOrganization.getName()); + userInfoOneVo.setDefaultOrgPath(sysOrganization.getSid()); + } else { + userInfoOneVo.setDefaultOrgPathName("暂无组织机构"); + }*/ + } + } + } + // 设置用户的角色sids + List roleSids = this.getUserRoleSids(user.getSid()); + userInfoOneVo.setRoleSids(roleSids); + String roleName = sysRoleService.selectByUserSid(user.getSid()); + userInfoOneVo.setRoleName(roleName); + List sysStaffOrgVos = sysStaffOrgService.selectByStaffS(user.getStaffSid()); + List orgList = new ArrayList<>(); + if (sysStaffOrgVos.size() > 0) { + for (SysStaffOrgVo vv : sysStaffOrgVos) { + OrgList orgList1 = new OrgList(); + /*String orgSid = sysStaffOrgService.getOrgByOrgSid(vv.getOrgSid()); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(orgSid); + if (sysOrganization != null) { + orgList1.setOrgName(sysOrganization.getName()); + orgList1.setOrgPath(sysOrganization.getSid()); + } else { + continue; + }*/ + orgList1.setOrgPath(vv.getOrgSidPath()); + orgList1.setOrgName(vv.getOrgNamePath()); + orgList.add(orgList1); + } + } + userInfoOneVo.setOrgList(orgList); + return userInfoOneVo; + } + + /** + * 手机端登录后设置token + * + * @param user + * @return + */ + public SysUserVo selectUser(SysUser user) { + String oldToken = user.getToken(); + if (StringUtils.isNotBlank(oldToken)) { + redisUtil.remove(oldToken); + } + String uniqueToken = JWTUtil.create(user.getSid() + ""); + String newToken = "App" + uniqueToken; + redisUtil.set(newToken, user.getUserName(), USERS_REDIS_SESSION_TL_App); + SysUserVo sysUserVo = selectUserOne(user); + if (sysUserVo == null) { + return null; + } else { + sysUserVo.setToken(newToken); + // 更新用户中的token + updateToken(user.getSid(), newToken); + //查询是否需要更换密码 + boolean isTrue = false; + String mobile = user.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + if (user.getPassword().equals(md5)) { + isTrue = true; + } + } + sysUserVo.setNeedResetPsd(isTrue); + return sysUserVo; + } + + } + + /** + * 获取用户的角色s + * + * @return + */ + public List getUserRoleSids(String userSid) { + return sysRoleService.selectByUser(userSid); + } + + public SysUser fetchByUserName(String mobile) { + SysUser sysUsers = baseMapper.fetchByUserName(mobile); + return sysUsers; + } + + public void delBySid(String sid) { + baseMapper.delBySid(sid); + } + + /** + * 发送短信验证码 + * + * @param mobile 手机号 + * @param verificationCode 验证码 + * @return ResultBean + */ + public ResultBean getVerificationCode(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 = 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 = MsgWs.SendWaitWorkMsg(mobile, verificationCode1); + if (!RESULT_CODE.equals(result)) { + return ResultBean.fireFail().setMsg("发送短信验证码失败"); + } + + } + } + } catch (Exception e) { + return ResultBean.fireFail().setMsg("发送短信验证码失败"); + } + //============= + return ResultBean.fireSuccess().setMsg("发送短信验证码成功"); + } + + /** + * 验证手机号和验证码是否正确及匹配 + * + * @param mobile 手机号 + * @param verificationCode 验证码 + * @return map + */ + public Map mobileValidateRegister(String mobile, String verificationCode) { + String code = redisUtil.get(mobile).substring(0, 4); + // 判断验证码是否失效 + if (StringUtils.isEmpty(code)) { + return Tools.setRetCode(Tools.CODE_FAIL, "验证码失效"); + } else if (!"".equals(code) && !verificationCode.equals(code)) { + return Tools.setRetCode(Tools.CODE_FAIL, "验证码错误"); + } + return Tools.setRetCode(Tools.CODE_SUCCESS, ""); + } + + /** + * 发送手机端登录验证码 + * + * @param mobile + * @param type 1、登录2、修改密码3、找回密码 + * @return + */ + public ResultBean sendVerificationCodeForApp(String mobile, String type) { + Date date = new Date(); + String redisKey = ""; + if (type.equals("1")) { + redisKey = "loginCode"; + } else if (type.equals("2")) { + redisKey = "updatePwdCode"; + } else if (type.equals("3")) { + redisKey = "resetPwdCode"; + } + String codeRedis = redisUtil.get(redisKey + mobile); + if (StringUtils.isNotEmpty(codeRedis)) { + //查看请求间隔,默认是一分钟,小于一分钟继续等待，超过一分钟发送短信 + String sendTime = codeRedis.substring(4); + long diffSecond = (date.getTime() - Long.parseLong(sendTime)) / 1000; + if (diffSecond < 60) { + return ResultBean.fireFail().setMsg("请等待一分钟后再次重试!"); + } + } + 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)集合，满足要求 + verificationCode = verificationCode + result; + } + String content = ""; + if (type.equals("1")) { + content = "登录验证码：" + verificationCode + "，用于登录App,有效期5分钟，如非本人操作，请忽略该短信。"; + } else { + content = "修改密码验证码：" + verificationCode + "，用于修改登录密码,有效期5分钟，如非本人操作，请忽略该短信。"; + } + String res = MsgWs.SendWaitWorkMsg(mobile, content); +// String res = "1"; + if (res.equals("1")) { + redisUtil.set(redisKey + mobile, verificationCode + date.getTime(), APP_LOGIN_CODE_TIME_LIMIT); + } + return ResultBean.fireSuccess().setMsg("发送短信验证码成功"); + } + + /** + * 手机端修改密码 + * + * @param mobile + * @param newPwd + * @return + */ + public ResultBean resetPwdApp(String mobile, String newPwd, String token) { + if (!newPwd.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { + return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); + } + SysUser user = baseMapper.selectByUserName(mobile); + if (user == null) { + user = baseMapper.selectByMobile(mobile); + if (user == null) { + return ResultBean.fireFail().setMsg("该手机号暂时还未注册，请先注册"); + } + + } + String newPwdMd5 = Encodes.md5(newPwd); + if (newPwdMd5.equals(user.getPassword())) { + return ResultBean.fireFail().setMsg("新密码不能与旧密码相同"); + } + int i = baseMapper.updatePassword(user.getSid(), newPwdMd5); + if (i == 1) { + if (StringUtils.isNotNull(token)) { + redisUtil.remove(token); + } + return ResultBean.fireSuccess().setMsg("修改成功"); + } else { + return ResultBean.fireFail().setMsg("修改失败"); + } + } + + public ResultBean updateHeadImage(MultipartFile file, SysUser user) { + Map resMap = imageUploadUtil.upload(file); + String oldHeadImage = user.getHeadImage(); + if ((boolean) resMap.get("isSuccess") == true) { + String url = resMap.get("url").toString(); + url = url.replace(fileUploadComponent.getUrlPrefix(), ""); + user.setHeadImage(url); + int i = baseMapper.updateHeadImage(user.getSid(), url); + if (i == 1) { + Map map = new HashMap<>(); + map.put("imageWidth", resMap.get("width").toString()); + map.put("imageHeight", resMap.get("height").toString()); + map.put("imageUrl", resMap.get("url").toString()); + // 删除原文件 +// oldHeadImage = fileUploadComponent.getUrlPrefix() + url; + String pathLoc = oldHeadImage.replace(fileUploadComponent.getUrlPrefix(), fileUploadComponent.getUploadPath()); + pathLoc = pathLoc.substring(0, pathLoc.lastIndexOf("/") + 1).replace("/", File.separator); + fileUploadComponent.deleteFiles(oldHeadImage, pathLoc); + return new ResultBean().success().setMsg("上传成功").setData(map); + } else { + return new ResultBean().fail().setMsg("上传失败"); + } + } + return new ResultBean().fail().setMsg("上传失败"); + } + + /** + * @param mobile 手机号 + * @param userType 用户类型 + * @description: 根据用户类型和手机号查询用户是否存在 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 11:36 + */ + public SysUser selectByMobileAndType(String mobile, int userType) { + return baseMapper.selectByMobileAndType(mobile, userType); + } + + /** + * @param userSid 用户sid + * @description: 根据用户sid查询用户头像和姓名 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 11:37 + */ + public WxMySysUserInfoVo selectMyInfo(String userSid) { + return baseMapper.selectMyInfo(userSid); + } + + /** + * @param mobile 手机号 + * @param verificationCode 验证码 + * @param type 类型：1、注册，2、登录 3、忘记密码 + * @description:客户端注册用户获取验证码 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 11:01 + */ + public ResultBean getWxVerificationCode(String mobile, String verificationCode, String type) { + String key = ""; + if ("1".equals(type)) {//注册 + key = DictCommonType.WX_REGIST + mobile; + } else if ("2".equals(type)) {//登录 + key = DictCommonType.WX_LOGIN + mobile; + } else if ("3".equals(type)) {//忘记密码 + key = DictCommonType.WX_FORGET + mobile; + } else if ("4".equals(type)) { + key = DictCommonType.WX_UPDATE + mobile; + } else { + if ("5".equals(type)) { + key = DictCommonType.WX_NEW + mobile; + } + } + for (int i = 0; i < LENGTH_OF_CODE; i++) { + Random random = new Random();// 定义随机类 + int result = random.nextInt(10);// 返回[0,10)集合中的整数，注意不包括10 + int num = result; // +1后，[0,10)集合变为[1,11)集合，满足要求 + verificationCode = verificationCode + num; + } + String verificationCode1 = ""; + if ("1".equals(type)) {//注册 + verificationCode1 = "个人注册验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略该短信。"; + } else if ("2".equals(type)) {//登录 + verificationCode1 = "登录验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略该短信。"; + } else if ("3".equals(type)) {//忘记密码 + verificationCode1 = "修改密码验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略该短信。"; + } else if ("4".equals(type) || "5".equals(type)) { + verificationCode1 = "验证码：" + verificationCode + ",有效期5分钟，如非本人操作，请忽略该短信。"; + } + try { + //当前时间秒数 + Long timemili = System.currentTimeMillis() / 1000; + System.out.println("当前的秒数" + timemili); + /*在这里写一个定时的for循环，用来取redis的手机号码信息，然后查询手机号码开始的时间，若是大于等于五分钟就给删除这个键值*/ + //创建多线程定时任务，延迟1s启动，每隔1s执行一次，是前一个任务开始时就开始计算时间间隔，但是会等上一个任务结束在开始下一个 + ScheduledExecutorService scheduledExecutorService = newScheduledThreadPool(10); + String finalKey = key; + scheduledExecutorService.scheduleAtFixedRate(new Runnable() { + @Override + public void run() { + //判断这个键的值是不是超过五分钟，是的话就删除掉这个键 + if (System.currentTimeMillis() / 1000 - Long.parseLong(redisUtil.get(finalKey).substring(4)) > 300) { + redisUtil.remove(finalKey); + } + } + }, 1, 2, TimeUnit.SECONDS); + boolean str = redisUtil.exists(key); //设置键值的时候先查询是否存在这个键值对，存在的话查看时长，不存在的话直接发送短信 + if (!str) { + redisUtil.set(key, (verificationCode + timemili)); + } else { + String strT = redisUtil.get(key); + //查看请求间隔,默认是一分钟,小于一分钟继续等待，超过一分钟发送短信 + if (timemili - Long.parseLong(strT.substring(4)) < 60) { + return ResultBean.fireFail().setMsg("请等待一分钟后再次重试!"); + } else { + //发送短信 + redisUtil.set(key, (verificationCode + timemili)); + } + } + } catch (Exception e) { + return ResultBean.fireFail().setMsg("发送短信验证码失败"); + } + return ResultBean.fireSuccess().setMsg("发送短信验证码成功"); + } + + /** + * @param mobile 手机号 + * @param verificationCode 验证码 + * @description: 客户端注册验证验证码是否正确 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 11:02 + */ + public Map mobileValidateWxRegister(String mobile, String verificationCode) { + String key = DictCommonType.WX_REGIST + mobile; + String code = redisUtil.get(key); + if (StringUtils.isNotBlank(code)) { + code = code.substring(0, 4); + } + // 判断验证码是否失效 + if (StringUtils.isEmpty(code)) { + return Tools.setRetCode(Tools.CODE_FAIL, "验证码失效"); + } else if (!"".equals(code) && !verificationCode.equals(code)) { + return Tools.setRetCode(Tools.CODE_FAIL, "验证码错误"); + } + return Tools.setRetCode(Tools.CODE_SUCCESS, ""); + } + + /** + * @param userName 用户名 + * @description: 根据用户名获取登录信息 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/6 15:09 + */ + public WxSysUserVo selectByWxUserName(String userName, int userType) { + WxSysUserVo wxSysUserVo = baseMapper.selectByWxUserName(userName, userType); + //根据客户sid查询姓名 + String staffSid = wxSysUserVo.getStaffSid(); + // 生成token + String uniqueToken = JWTUtil.create(wxSysUserVo.getUserSid() + ""); + String token = "WX" + uniqueToken; + //查询是否有旧token,存在的话清除掉redis中的该token + if (StringUtils.isNotBlank(wxSysUserVo.getToken())) { + //查询是否过期 + String values = redisUtil.get(wxSysUserVo.getToken()); + if (StringUtils.isNotBlank(values)) { + redisUtil.remove(wxSysUserVo.getToken()); + } + } + // redis中缓存token + redisUtil.set(token, wxSysUserVo.getUserName(), + USERS_REDIS_SESSION_TL_PC); + wxSysUserVo.setToken(token); + wxSysUserVo.setNum("1"); + // 更新用户中的token + updateToken(wxSysUserVo.getUserSid(), token); + return wxSysUserVo; + } + + public ResultBean resetPwdWx(String mobile, String newPwd) { + if (!newPwd.matches("^(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])[a-zA-Z0-9]{8,10}$")) { + return ResultBean.fireFail().setMsg("密码格式错误，必须为8至10位大小写字母和数字的组合"); + } + SysUser user = baseMapper.selectByMobileAndType(mobile, 2); + if (null == user) { + return ResultBean.fireFail().setMsg("该手机号暂时还未注册，请先注册"); + } + String newPwdMd5 = Encodes.md5(newPwd); + if (newPwdMd5.equals(user.getPassword())) { + return ResultBean.fireFail().setMsg("新密码不能与旧密码相同"); + } + int i = baseMapper.updatePassword(user.getSid(), newPwdMd5); + if (i == 1) { + return ResultBean.fireSuccess().setMsg("修改成功"); + } else { + return ResultBean.fireFail().setMsg("修改失败"); + } + } + + public SysUserVo selectByStaffsid(@Param("staffSid") String staffSid) { + return baseMapper.selectByStaffsid(staffSid); + } + + /** + * @param userSid 用户sid + * @description: 根据用户sid查询首页信息 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/12 11:29 + */ + public WxHomePageVo selectHomePage(String userSid) { + return baseMapper.selectHomePage(userSid); + } + + public int delSysUserByMobile(String mobile) { + return baseMapper.delSysUserByMobile(mobile); + } + + /** + * 查询所有用户的sid + * + * @return + */ + public List selectAllUserSid() { + return baseMapper.selectAllUserSid(); + } + + public SysStaffinfoVo getSysUserByMobile(String staffSid) { + return baseMapper.getSysUserByMobile(staffSid); + } + + /** + * 根据用户sid获取orgSid(多个时取第一个) + * + * @param userSid + * @return + */ + public AppUserOrgInfoVo getUserOrgInfoByUserSid(String userSid) { + return baseMapper.getUserOrgInfoByUserSid(userSid); + } + + /** + * 根据用户sid获取用户的组织信息 + * + * @param userSid 用户的sid + * @return + */ + public SysUserInfoVo selectUserInfoByUserSid(String userSid) { + return baseMapper.selectUserInfoByUserSid(userSid); + } + + /** + * 根据用户sid获取用户的组织信息 + * + * @param userSid 用户的sid + * @return + */ + public SysUserInfoVo selectUserInfoByUserSid(String userSid, String orgSid) { + return baseMapper.selectUserInfoByUserSidOne(userSid, orgSid); + } + + /** + * 根据员工sid更新用户信息 + * + * @param jobNumber 员工编号 + * @param mobile 手机号 + * @param sid 员工sid + * @return + */ + public int updateByStaffSid(String jobNumber, String mobile, String sid) { + return baseMapper.updateByStaffSid(jobNumber, mobile, sid); + } + + /** + * 根据员工sid更新用户的员工编号 + * + * @param jobNumber 员工编号 + * @param sid 用户sid + * @return + */ + public int updateByStaSid(String jobNumber, String sid) { + return baseMapper.updateByStaSid(jobNumber, sid); + } + + /** + * 根据手机号查询用户是否存在 + * + * @param mobile + * @return + */ + public SysUser selectByMobile(String mobile) { + return baseMapper.selectByMobile(mobile); + } + + public ResultBean reGetPwd(String userName, String userPhone) { + ResultBean rb = ResultBean.fireFail(); + return null; + } + + public int updateIsEnable(String sid, String isEnable) { + return baseMapper.updateIsEnable(sid, isEnable); + } + + public ResultBean getUsersByRoleSid(String roleSid) { + List users = baseMapper.getUsersByRoleSid(roleSid); + List l = new ArrayList<>(); + for (SysUserVo s : users) { + l.add(s.getDepartmentName() == null ? "" : s.getDepartmentName()); + } + HashSet set = new HashSet(l); + //把List集合所有元素清空 + l.clear(); + //把HashSet对象添加至List集合 + l.addAll(set); + List> r = new ArrayList<>(); + for (String s : l) { + if (StringUtils.isNotBlank(s)) { + Map m = new HashMap<>(); + List us = new ArrayList<>(); + for (SysUserVo su : users) { + if (s != null && s.equals(su.getDepartmentName())) { + us.add(su); + } + } + m.put("dept", s); + m.put("users", us); + r.add(m); + } + } + ResultBean objectResultBean = ResultBean.fireSuccess().setData(r); + return objectResultBean; + } + + public ResultBean> getUserByRole(UserQuery query) { + ResultBean> rb = ResultBean.fireFail(); + List sysUserVoList = new ArrayList<>(); + if (StringUtils.isBlank(query.getRoleSid())) { + return rb.setMsg("角色sid不能为空"); + } + if (StringUtils.isBlank(query.getOrgSidPath())) { + return rb.setMsg("机构全路径不能为空"); + } + //根据角色sid获取角色的层级 + String levelTypeKey = sysRoleService.getLevelType(query.getRoleSid()); + if (StringUtils.isNotBlank(levelTypeKey)) { + if (query.getOrgSidPath().split("/").length >= Integer.parseInt(levelTypeKey) - 1) { + String levelOrgSid = query.getOrgSidPath().split("/")[Integer.parseInt(levelTypeKey) - 1]; + sysUserVoList = baseMapper.getUserByRole(query.getRoleSid(), levelOrgSid); + if(sysUserVoList.size()>1){ + List stringList = sysUserVoList.stream().map(v->v.getSid()).collect(Collectors.toList()); + List sysUserVoList1 = baseMapper.getUserMessageByRole(query.getRoleSid(), levelOrgSid,stringList); + sysUserVoList1.removeAll(Collections.singleton(null)); + if(sysUserVoList1.size()>0){ + sysUserVoList = sysUserVoList1; + } + } + } + sysUserVoList.removeAll(Collections.singleton(null)); + sysUserVoList.forEach(t -> { + t.setOrgSidPath(query.getOrgSidPath()); + }); + } else { + return rb.setMsg("该角色层级未设置"); + } + + return rb.success().setData(sysUserVoList); + + + } + + public ResultBean>> getUserByOrgSid(String orgSid, String userSid) { + ResultBean rb = ResultBean.fireFail(); + List> user = baseMapper.getUserByOrgSid(orgSid, userSid); + for (Map map : user) { + StringBuilder namePath = new StringBuilder(); + String name = map.get("name"); + String orgName = map.get("orgName"); + String postName = map.get("postName"); + namePath.append(name).append("(").append(orgName).append(" ").append(postName).append(")"); + map.put("namePath", namePath.toString()); + } + /*List> user = new ArrayList<>(); + for (Map map : userByOrgSid) { + String s = map.get("sid"); + ResultBean pathSidByUserSid = sysStaffOrgService.getPathSidByUserSid(s); + String data = pathSidByUserSid.getData(); + if (data.equals(orgSid)){ + user.add(map); + } + }*/ + return rb.success().setData(user); + } + + public List fetchBySidSVo(String sids) { + List list = Arrays.asList(sids.split(",")); + List entity = baseMapper.fetchBySids(list); + return entity; + } + + public ResultBean updateAppIdByMobile(String mobile) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isNotBlank(mobile)) { + baseMapper.updateAppIdByMobile(mobile); + } else { + baseMapper.updateAppIdAll(); + } + return rb.success().setMsg("解绑成功"); + } + + public ResultBean selectIdBySid(List stringList) { + ResultBean rb = ResultBean.fireFail(); + String ids = baseMapper.selectIdBySid(stringList); + return rb.success().setData(ids); + } + + public ResultBean> getUserByOrgRole(UserRoleQuery query) { + ResultBean> rb = ResultBean.fireFail(); + List sysUserVoList = new ArrayList<>(); + //根据当前用户角色查询该角色的上一级角色 + String userRoleSid = query.getRoleSid(); + if (StringUtils.isBlank(userRoleSid)) { + return rb.setMsg("角色不能为空"); + } + if (StringUtils.isBlank(query.getOrgSid())) { + return rb.setMsg("部门sid不能为空"); + } + String upRoleSid = sysRoleService.selectRoleSid(userRoleSid); + sysUserVoList = baseMapper.getUserByRole(upRoleSid, query.getOrgSid()); + return rb.success().setData(sysUserVoList); + } + + public ResultBean> getOtherOrgRoleUser(UserRoleQuery query) { + ResultBean> rb = ResultBean.fireFail(); + List sysUserVoList = new ArrayList<>(); + String roleSid = query.getRoleSid(); + if (StringUtils.isBlank(roleSid)) { + return rb.setMsg("角色不能为空"); + } + if (StringUtils.isNotBlank(query.getOrgSid())) { + sysUserVoList = baseMapper.getUserByRole(roleSid, query.getOrgSid()); + } else { + sysUserVoList = baseMapper.getUserByRoleSid(query.getRoleSid()); + } + return rb.success().setData(sysUserVoList); + } + + public ResultBean> selectSysUserList(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + //销售经理角色sid + String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f"; + //根据用户sid查询用户的部门全路径 + SysUserVo vo = fetchBySidVo(userSid); + //根据staffSid获取用户的组织全路径 + SysStaffOrg sysStaffOrg = sysStaffOrgService.getOrgByStaffSid(vo.getStaffSid()); + UserQuery userRoleQuery = new UserQuery(); + userRoleQuery.setRoleSid(roleSid); + userRoleQuery.setOrgSidPath(sysStaffOrg.getOrgSidPath()); + ResultBean> resultBean = getUserByRole(userRoleQuery); + List sysUserVoList = resultBean.getData(); + sysUserVoList.removeAll(Collections.singleton(null)); + List voList = Optional.ofNullable(sysUserVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SysUserListVo.class)).collect(Collectors.toList()); + voList.removeAll(Collections.singleton(null)); + if (voList.isEmpty()) { + return rb.setMsg("下一环节没有用户"); + } + return rb.success().setData(voList); + } + + public ResultBean selectPasswordByUserSid(String userSid) { + ResultBean rb = ResultBean.fireFail(); + boolean isTrue = false; + //查询手机号 + SysUser sysUser = fetchBySid(userSid); + if (sysUser != null) { + String mobile = sysUser.getMobile(); + if (StringUtils.isNotBlank(mobile)) { + String password = mobile.substring(5, 11); + String md5 = Encodes.md5(password); + if (sysUser.getPassword().equals(md5)) { + isTrue = true; + } + } + } + return rb.success().setData(isTrue); + } + + public List selectOrgBySid(String orgPath, String staffSid) { + return sysStaffOrgService.selectOrgBySid(orgPath, staffSid); + } + + public List getPost(String staffSid) { + return sysStaffPostService.getPost(staffSid); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/app/AppSysUserRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/app/AppSysUserRest.java new file mode 100644 index 00000000..bc0f247f --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/app/AppSysUserRest.java @@ -0,0 +1,412 @@ +package com.yxt.supervise.portal.biz.sysuser.app; + +import com.alibaba.fastjson.JSON; +import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.anrui.portal.api.sysuser.SysUserQuery; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuser.app.AppMySysUserInfo; +import com.yxt.anrui.portal.api.sysuser.app.AppSysUserFeign; +import com.yxt.anrui.portal.api.sysuser.app.MyInfoQuery; +import com.yxt.supervise.portal.biz.sysuser.SysUserService; +import com.yxt.common.base.config.RedisUtil; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.utils.*; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import java.util.*; + +/** + * @Description + * @Author liuguohui + * @Date 2021/9/4 + */ +@Api(tags = "用户表-移动端") +@Controller +@RequestMapping("v1/appuser") +public class AppSysUserRest implements AppSysUserFeign { + + @Autowired + private SysUserService sysUserService; + @Autowired + private RedisUtil redisUtil; + @Autowired(required = false) + private HttpServletRequest httpServletRequest; + @Autowired + private FileUploadComponent fileUploadComponent; + + @Override + public ResultBean login(SysUserQuery userQuery) { + /* + 1、根据传参设备appId查询绑定账号 + 1、1未查询到绑定的账号： + 1、1、1、查询用户登录账号（不存在-->返回“账号不存在”）； + 1、1、2、账号存在，获取当前账号绑定的设备值： + 1）设备值为空，验证登录成功后即绑定设备，返回用户信息，验证不成功返回错误信息（验证码、密码错误） + 2）设备值存在，向表sys_exception_log插入数据，返回：当前账号已被其它设备绑定（错误码101（说明：错误码为sys_exception_log的id）） + 1、2查询到绑定的账号 + 1、2、1、根据传参设备appId查询到绑定的账号与用户传递的账号不一致 + 1）向表sys_exception_log插入数据，返回：当前设备已绑定其它账号（错误码102） + 1、2、2、根据传参设备appId查询到绑定的账号与用户传递的账号一致，验证登录信息 + 1）验证登录信息，成功后返回用户信息，验证不成功返回错误信息（验证码、密码错误） + */ + ResultBean rb = ResultBean.fireFail(); + String userName = userQuery.getUserName(); + String password = userQuery.getPassword(); + String appId = userQuery.getAppId(); + String verifyCode = userQuery.getVerifyCode(); + String type = userQuery.getType(); // type:1、密码登录2、验证码登录 + + if (StringUtils.isBlank(userName)) return new ResultBean().fail().setMsg("用户名不能为空"); + if (StringUtils.isBlank(appId)) return new ResultBean().fail().setMsg("appId不能为空"); + if (type.equals("1")) { + if (StringUtils.isBlank(password)) return new ResultBean().fail().setMsg("密码不能为空"); + } else { + if (StringUtils.isBlank(verifyCode)) return new ResultBean().fail().setMsg("验证码不能为空"); + // 访问后清理key + } + boolean isTest = false; + if(userQuery.getIsTest() != null){ + isTest = userQuery.getIsTest(); + } + if (isTest) {//添加测试版 + SysUser sysUser = sysUserService.selectByUserNameApp(userName); + if (sysUser == null) { + sysUser = sysUserService.selectByMobile(userName); + if (sysUser == null) { + return rb.setMsg("账号不存在"); + } + } + if (type.equals("1")) { + String md5 = Encodes.md5(password); + if (md5.equals(sysUser.getPassword())) { + sysUserService.updateAppId(sysUser.getSid(), appId); + SysUserVo sysUserVo = sysUserService.selectUser(sysUser); + if (sysUserVo == null) { + return rb.setMsg("该用户不是公司员工"); + } + insertLoginLog(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } else { + String codeFromRedis = redisUtil.get("loginCode" + userName); + if (StringUtils.isBlank(codeFromRedis)) + return new ResultBean().fail().setMsg("短信验证码已失效，请重新发送"); + if (verifyCode.equals(codeFromRedis.substring(0, 4))) { + sysUserService.updateAppId(sysUser.getSid(), appId); + SysUserVo sysUserVo = sysUserService.selectUser(sysUser); + if (sysUserVo == null) { + return rb.setMsg("该用户不是公司员工"); + } + redisUtil.remove("loginCode" + userName); + insertLoginLog(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("短信验证码错误或已失效，请重新获取"); + } + } + } else { + SysUser sysUser = sysUserService.selectByAppId(appId); + if (null == sysUser) { // 未查询到绑定的账号 + sysUser = sysUserService.selectByUserNameApp(userName); + if (sysUser == null) { + sysUser = sysUserService.selectByMobile(userName); + if (sysUser == null) { + return rb.setMsg("账号不存在"); + } + } + String appIdVal = sysUser.getAppId(); + if (StringUtils.isBlank(appIdVal)) { // 设备值为空 + if (type.equals("1")) { + String md5 = Encodes.md5(password); + if (md5.equals(sysUser.getPassword())) { + sysUserService.updateAppId(sysUser.getSid(), appId); + SysUserVo sysUserVo = sysUserService.selectUser(sysUser); + if (sysUserVo == null) { + return rb.setMsg("该用户不是公司员工"); + } + insertLoginLog(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } else { + String codeFromRedis = redisUtil.get("loginCode" + userName); + if (StringUtils.isBlank(codeFromRedis)) + return new ResultBean().fail().setMsg("短信验证码已失效，请重新发送"); + if (verifyCode.equals(codeFromRedis.substring(0, 4))) { + sysUserService.updateAppId(sysUser.getSid(), appId); + SysUserVo sysUserVo = sysUserService.selectUser(sysUser); + if (sysUserVo == null) { + return rb.setMsg("该用户不是公司员工"); + } + redisUtil.remove("loginCode" + userName); + insertLoginLog(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("短信验证码错误或已失效，请重新获取"); + } + } + } else { // 设备值存在 + int res = insertSysExceptionLog("b", JSON.toJSON(userQuery).toString(), "当前账号已被其它设备绑定"); + return new ResultBean().fail().setMsg("当前账号已被其它设备绑定（错误码：" + res + ")"); + } + } else { // 查询到绑定的账号 + if (userName.equals(sysUser.getUserName()) || userName.equals(sysUser.getMobile())) { // 设备appId一致,验证用户名 + if (type.equals("1")) { + String md5 = Encodes.md5(password); + if (md5.equals(sysUser.getPassword())) { + SysUserVo sysUserVo = sysUserService.selectUser(sysUser); + if (sysUserVo == null) { + return rb.setMsg("该用户不是公司员工"); + } + insertLoginLog(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("用户名或密码错误"); + } + } else { + String codeFromRedis = redisUtil.get("loginCode" + userName); + if (StringUtils.isBlank(codeFromRedis)) + return new ResultBean().fail().setMsg("短信验证码已失效，请重新发送"); + if (verifyCode.equals(codeFromRedis.substring(0, 4))) { + SysUserVo sysUserVo = sysUserService.selectUser(sysUser); + if (sysUserVo == null) { + return rb.setMsg("该用户不是公司员工"); + } + redisUtil.remove("loginCode" + userName); + insertLoginLog(sysUser); + return new ResultBean().success().setData(sysUserVo); + } else { + return new ResultBean().fail().setMsg("短信验证码错误或已失效，请重新获取"); + } + } + } else { // 用户名不一致 + int res = insertSysExceptionLog("a", JSON.toJSON(userQuery).toString(), "当前设备已绑定其它账号"); + return new ResultBean().fail().setMsg("当前设备已绑定其它账号（错误码：" + res + ")"); + } + } + } + } + + /** + * 插入登录日志 + * + * @param user + */ + private void insertLoginLog(SysUser user) { + } + + /** + * 手机发送短信验证码 + * + * @param mobile + * @param type 1、登录2、修改密码3、找回密码 + * @param appId 绑定手机的appid + * @return + */ + @Override + public ResultBean sendVerificationCodeForApp(String mobile, String type, String appId) { + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { + return new ResultBean().fail().setMsg("请输入正确的手机号"); + } + if (type.equals("1") && StringUtils.isBlank(appId)) { + return new ResultBean().fail().setMsg("appId不能为空"); + } + // 登录、修改密码、重置密码先验证mobile与appId是否一致 +// if(type.equals("1") && !appId.equals(sysUser.getAppId())){ +// return new ResultBean().fail().setMsg("当前设备与账号不匹配，请解绑后再试"); +// } + if (type.equals("2") || type.equals("3")) { + SysUser sysUser = sysUserService.selectByUserNameApp(mobile); + if (null == sysUser) { + sysUser = sysUserService.selectByMobile(mobile); + if (sysUser == null) { + return new ResultBean().fail().setMsg("该手机号暂时还未注册，请先注册"); + } + + } + } else { // 登录 + SysUser sysUser = sysUserService.selectByAppId(appId); + if (sysUser == null) { // 设备未绑定账号 + sysUser = sysUserService.selectByUserNameApp(mobile); + if (sysUser == null) { + sysUser = sysUserService.selectByMobile(mobile); + if (sysUser == null) { + return new ResultBean().fail().setMsg("该手机号暂时还未注册，请先注册"); + } + } + if (StringUtils.isNotBlank(sysUser.getAppId())) { + Map map = new HashMap<>(); + map.put("mobile", mobile); + map.put("appId", appId); + int res = insertSysExceptionLog("b", JSON.toJSON(map).toString(), "当前账号已被其它设备绑定"); + return new ResultBean().fail().setMsg("当前账号已被其它设备绑定（错误码：" + res + ")"); + } + } else { // 设备已绑定账号 + if (!mobile.equals(sysUser.getMobile())) { + Map map = new HashMap<>(); + map.put("mobile", mobile); + map.put("appId", appId); + int res = insertSysExceptionLog("a", JSON.toJSON(map).toString(), "当前设备已绑定其它账号"); + return new ResultBean().fail().setMsg("当前设备已绑定其它账号（错误码：" + res + ")"); + } + } + } + return sysUserService.sendVerificationCodeForApp(mobile, type); + } + + /** + * 插入错误的信息 + * + * @param operChar + * @param operArg + * @param remark + */ + private int insertSysExceptionLog(String operChar, String operArg, String remark) { + return 0; + } + + @Override + public ResultBean getMyInfo(String userSid) { + if (StringUtils.isBlank(userSid)) return new ResultBean().fail().setMsg("userSid不能为空"); + SysUserVo sysUserVo = sysUserService.fetchBySidVo(userSid); + if (null == sysUserVo) new ResultBean().fail().setMsg("信息错误"); + AppMySysUserInfo userInfo = new AppMySysUserInfo(); + String headImage = ""; + if (StringUtils.isNotBlank(sysUserVo.getHeadImage())) { + headImage = fileUploadComponent.getUrlPrefix() + sysUserVo.getHeadImage(); + } + userInfo.setHeadImage(headImage); + userInfo.setName(StringUtils.isBlank(sysUserVo.getName()) ? "" : sysUserVo.getName()); + userInfo.setId("ID：" + sysUserVo.getId()); +// Map map = new HashMap<>(); +// map.put("headImage", StringUtils.isBlank(sysUserVo.getHeadImage())?"":sysUserVo.getHeadImage()); +// map.put("name", StringUtils.isBlank(sysUserVo.getName())?"":sysUserVo.getName()); +// map.put("ID", "ID："+sysUserVo.getId()); // 是否为jobNumber，暂时为空 + return new ResultBean().success().setData(userInfo); + } + + @Override + public ResultBean getMyInfo(MyInfoQuery myInfoQuery) { + ResultBean rb = ResultBean.fireFail(); + String userSid = myInfoQuery.getUserSid(); + String orgPath = myInfoQuery.getOrgPath(); + SysUserVo sysUserVo = sysUserService.fetchBySidVo(userSid); + if (null == sysUserVo) rb.setMsg("信息错误"); + AppMySysUserInfo userInfo = new AppMySysUserInfo(); + String headImage = ""; + if (StringUtils.isNotBlank(sysUserVo.getHeadImage())) { + headImage = fileUploadComponent.getUrlPrefix() + sysUserVo.getHeadImage(); + } + userInfo.setHeadImage(headImage); + userInfo.setName(StringUtils.isBlank(sysUserVo.getName()) ? "" : sysUserVo.getName()); + userInfo.setId("ID：" + sysUserVo.getJobNumber()); + //根据组织机构sid查询该用户的职位以及分公司的部门 + List strings = new ArrayList<>(); + List list = sysUserService.selectOrgBySid(orgPath, sysUserVo.getStaffSid()); + for (SysStaffOrg s : list) { + String orgName = s.getOrgName(); + strings.add(orgName); + } + strings.removeAll(Collections.singleton(null)); + if (!strings.isEmpty()) { + userInfo.setDepartment(String.join("|", strings)); + } + //根据用户sid查询岗位 + List stringList = sysUserService.getPost(sysUserVo.getStaffSid()); + stringList.removeAll(Collections.singleton(null)); + if (!stringList.isEmpty()) { + userInfo.setPosition(String.join("|", stringList)); + } + return new ResultBean().success().setData(userInfo); + } + + @Override + public ResultBean updatePassword(String userSid, String appId, String oldPassword, String newPassword, HttpServletRequest httpServletRequest) { + ResultBean rb = ResultBean.fireFail(); + String token = httpServletRequest.getHeader("token"); + SysUser user = sysUserService.fetchBySid(userSid); + if (user == null) { + return rb.setMsg("抱歉，用户不存在"); + } + if (!appId.equals(user.getAppId())) { + return rb.setMsg("当前设备与账号不匹配，请解绑后再试"); + } + return sysUserService.updatePasswordApp(user, oldPassword, newPassword, token); + } + + @Override + public ResultBean checkResetPwdCode(String resetPwdCode, String mobile) { + if (StringUtils.isBlank(resetPwdCode)) return new ResultBean().fail().setMsg("验证码不能为空"); + String codeFromRedis = redisUtil.get("resetPwdCode" + mobile); + if (StringUtils.isBlank(codeFromRedis)) return new ResultBean().fail().setMsg("短信验证码已失效，请重新发送"); + if (resetPwdCode.equals(codeFromRedis.substring(0, 4))) { + redisUtil.remove("resetPwdCode" + mobile); + return new ResultBean().success(); + } else { + return new ResultBean().fail().setMsg("短信验证码错误或已失效，请重新获取"); + } + } + + + @Override + public ResultBean resetPwdApp(String mobile, String newPwd, HttpServletRequest httpServletRequest) { + String token = httpServletRequest.getHeader("token"); + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) + return new ResultBean().fail().setMsg("请输入正确的手机号"); + if (StringUtils.isBlank(newPwd)) return new ResultBean().fail().setMsg("请输入密码"); + return sysUserService.resetPwdApp(mobile, newPwd, token); + } + + @Override + public ResultBean updateHeadImage(MultipartFile multipartFile, String userSid) { + SysUser user = sysUserService.fetchBySid(userSid); + if (user == null) return new ResultBean().fail().setMsg("抱歉，用户不存在"); + if (multipartFile.isEmpty()) { + return new ResultBean().fail().setMsg("上传图片不能为空"); + } + String filename = multipartFile.getOriginalFilename(); + String suffix = filename.substring(filename.lastIndexOf(".")); + if (!suffix.equals(".jpg") && !suffix.equals(".jpeg") && !suffix.equals(".png") && !suffix.equals(".bmp") && !suffix.equals(".tif") && !suffix.equals(".gif")) { + return new ResultBean().fail().setMsg("图片格式不正确"); + } + return sysUserService.updateHeadImage(multipartFile, user); + + } + + /** + * 手机端根据token获取userSid + * + * @return + */ + @Override + public ResultBean getUserSidByToken(String token) { + DecodedJWT decode = JWT.decode(token.substring(3)); + String userSid = JWTUtil.getUserSid(decode); + if (StringUtils.isBlank(userSid)) { + return new ResultBean().fail().setMsg("用户sid不能为空"); + } else { + return new ResultBean().success().setData(userSid); + } + } + + @Override + public ResultBean updateAppId(String mobile) { + return sysUserService.updateAppIdByMobile(mobile); + } + + + // 解绑设备关联的账号 + // 解绑账号绑定的设备 +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/wx/WxSysUserRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/wx/WxSysUserRest.java new file mode 100644 index 00000000..6caddc44 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuser/wx/WxSysUserRest.java @@ -0,0 +1,365 @@ +package com.yxt.supervise.portal.biz.sysuser.wx; + +import cn.hutool.core.codec.Base64; +import com.auth0.jwt.JWT; +import com.auth0.jwt.interfaces.DecodedJWT; +import com.yxt.anrui.portal.api.sysuser.SysUser; +import com.yxt.anrui.portal.api.sysuser.wx.*; +import com.yxt.supervise.portal.biz.sysorganization.SysOrganizationService; +import com.yxt.supervise.portal.biz.sysstaffinfo.SysStaffinfoService; +import com.yxt.supervise.portal.biz.sysuser.SysUserService; +import com.yxt.common.base.config.RedisUtil; +import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.base.utils.*; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.portal.config.DictCommonType; +import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import javax.servlet.http.HttpServletRequest; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.security.InvalidKeyException; +import java.security.Key; +import java.security.NoSuchAlgorithmException; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +/** + * @author dimengzhe + * @date 2021/10/5 13:09 + * @description 客户端用户接口 + */ +@Controller +@RequestMapping("v1/wxuser") +@Api(tags = "用户表-小程序端") +public class WxSysUserRest implements WxSysUserFeign { + + @Autowired + private SysUserService sysUserService; + @Autowired + private SysStaffinfoService sysStaffinfoService; + @Autowired + private RedisUtil redisUtil; + @Autowired + private SysOrganizationService sysOrganizationService; + @Autowired + private HttpServletRequest request; + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private HttpServletRequest httpServletRequest; + + /** + * 调用发送短信接口返回值 + */ + static final String RESULT_CODE = "1"; + + /** + * @param mobile 手机号 + * @param type 类型:1、注册，2、登录 3、忘记密码，4旧手机号获取验证码、5新手机号 + * @description: 获取验证码(按类型区分是哪块验证码) + * @return: + * @Author: dimengzhe + * @Date: 2021/10/9 9:12 + */ + @Override + public ResultBean sendMessageCode(String mobile, String type) { + //1、注册，2、登录 3、忘记密码 + ResultBean rb = ResultBean.fireFail(); + //验证手机号是否正确 + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { + return rb.setMsg("请输入正确的手机号"); + } + if ("2".equals(type) || "3".equals(type)) { + //查询该手机号是否已注册 + SysUser sysUser = sysUserService.selectByMobileAndType(mobile, 2); + if (null == sysUser) { + return rb.setMsg("该手机号还未注册或已被停用"); + } + } + if ("4".equals(type)) { + //将token解密userSid + String token = request.getHeader("token"); + DecodedJWT decodedJWT = JWT.decode(token.substring(2, token.length())); + String userSid = JWTUtil.getUserSid(decodedJWT); + SysUser sysUser = sysUserService.fetchBySid(userSid); + if (sysUser == null) { + return rb.setMsg("请登录"); + } + if (!sysUser.getUserName().equals(mobile)) { + return rb.setMsg("手机号错误"); + } + } + //验证是否已注册 + if ("5".equals(type)) { + SysUser sysUser = sysUserService.selectByMobileAndType(mobile, 2); + if (sysUser != null) { + return rb.setMsg("该手机号已注册"); + } + } + String verificationCode = ""; + return sysUserService.getWxVerificationCode(mobile, verificationCode, type); + } + + /** + * @param wxSysUserLoginQuery 数据传输对象 + * @description: 免密码登录、账号密码登录 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/9 9:15 + */ + @Override + public ResultBean login(WxSysUserLoginQuery wxSysUserLoginQuery) { + WxSysUserVo wxSysUserVo = new WxSysUserVo(); + ResultBean rb = ResultBean.fireFail(); + String type = wxSysUserLoginQuery.getType();//手机登录类型：1、密码登录，2、验证码登录 + String verifyCode = wxSysUserLoginQuery.getVerifyCode();//验证码 + String password = wxSysUserLoginQuery.getPassword();//密码 + String userName = wxSysUserLoginQuery.getUserName(); + if ("1".equals(type)) {//密码登录 + if (StringUtils.isBlank(password)) { + return rb.setMsg("密码不能为空"); + } + } else if ("2".equals(type)) {//验证码登录 + if (StringUtils.isBlank(verifyCode)) { + return rb.setMsg("验证码不能为空"); + } + } + SysUser sysUser = sysUserService.selectByMobileAndType(userName, 2); + if (null == sysUser) { + return rb.setMsg("账号不存在或已被停用"); + } + if ("1".equals(type)) {//密码登录 + String md5 = Encodes.md5(password); + if (md5.equals(sysUser.getPassword())) {//匹配 + wxSysUserVo = sysUserService.selectByWxUserName(userName, 2); + } else { + return rb.setMsg("用户名或密码错误"); + } + } else if ("2".equals(type)) {//验证码登录 + String redisCode = redisUtil.get(DictCommonType.WX_LOGIN + userName); + if (StringUtils.isBlank(redisCode)) { + return rb.setMsg("短信验证码错误或已失效，请重新获取"); + } + if (verifyCode.equals(redisCode.substring(0, 4))) { + wxSysUserVo = sysUserService.selectByWxUserName(userName, 2); + redisUtil.remove(DictCommonType.WX_LOGIN + userName); + + } else { + return rb.setMsg("短信验证码错误或已失效，请重新获取"); + } + } + return new ResultBean().success().setData(wxSysUserVo); + } + + /** + * @param wxSysUserDto 数据传输对象 + * @description: 客户端注册 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/9 9:21 + */ + @Override + public ResultBean registsUser(WxSysUserDto wxSysUserDto) { + ResultBean rb = ResultBean.fireFail(); + String mobile = wxSysUserDto.getMobile();//手机号 + String idNo = wxSysUserDto.getIdNo();//身份证号 + String verificationCode = wxSysUserDto.getVerificationCode();//验证码 + String name = wxSysUserDto.getName();//姓名 + String result = ""; + //判断身份证号是否正确 + try { + if (StringUtils.isNotBlank(RegexUtil.IDCardValidate(idNo))) { + return rb.setMsg(RegexUtil.IDCardValidate(idNo)); + } + } catch (ParseException e) { + e.printStackTrace(); + } + //判断是否已注册 + int userType = 2;//用户类型 + SysUser sysUser = sysUserService.selectByMobileAndType(mobile, userType); + if (sysUser != null) { + return rb.setMsg("该手机号已注册"); + } + //验证码是否正确 + Map map = sysUserService.mobileValidateWxRegister(mobile, verificationCode); + String code = map.get("code").toString(); + boolean isSave = false; + if (Tools.CODE_SUCCESS.equals(code)) { + //需验证手机号+姓名+身份证号是否匹配 + + } else { + return ResultBean.fireFail().setMsg(map.get("details").toString()); + } + if (!isSave) { + return ResultBean.fireSuccess().setMsg("注册失败"); + } + if (!RESULT_CODE.equals(result)) { + return ResultBean.fireFail().setMsg("注册成功，未发送密码"); + } + return ResultBean.fireSuccess().setMsg("注册成功"); + } + + /** + * @param userSid 用户sid + * @description: 客户端获取我的信息 + * @return: 头像+保密后的姓名 + * @Author: dimengzhe + * @Date: 2021/10/6 12:19 + */ + @Override + public ResultBean selectMyInfo(String userSid) { + ResultBean rb = ResultBean.fireFail(); + SysUser sysUser = sysUserService.fetchBySid(userSid); + if (null == sysUser) { + return rb.setMsg("该用户不存在"); + } + WxMySysUserInfoVo infoVo = sysUserService.selectMyInfo(userSid); + return rb.success().setData(infoVo); + } + + @Override + public ResultBean selectHomePage(String userSid) { + ResultBean rb = ResultBean.fireFail(); + SysUser sysUser = sysUserService.fetchBySid(userSid); + if (null == sysUser) { + return rb.setMsg("该用户不存在"); + } + boolean isHave = false; + WxHomePageVo wxHomePageVo = sysUserService.selectHomePage(userSid); + //2018.08.24-2038.08.24 + String idTerm = wxHomePageVo.getIdTerm(); + List split = Arrays.asList(idTerm.split("-")); + if (split.size() == 2) { + String idTermEnd = split.get(1); + String date = idTermEnd.replace('.', '-'); + int days = days(date); + if (days == 30 || days == 60) { + isHave = true; + wxHomePageVo.setMessage("您的身份证将在" + days + "天后到期，请及时更新信息"); + } + } + wxHomePageVo.setIsHave(isHave); + return new ResultBean().success().setData(wxHomePageVo); + } + + @Override + public ResultBean checkResetPwdCode(String code, String mobile, String type) { + ResultBean rb = ResultBean.fireFail(); + String key = ""; + if (!"1".equals(type) && !"2".equals(type) && !"3".equals(type)) { + return rb.setMsg("类型错误"); + } + if ("1".equals(type)) { + key = DictCommonType.WX_FORGET + mobile; + } else if ("2".equals(type)) { + key = DictCommonType.WX_UPDATE + mobile; + } else if ("3".equals(type)) { + key = DictCommonType.WX_NEW + mobile; + } + String keyOne = redisUtil.get(key); + String redisCode = redisUtil.get(key).substring(0, 4); + // 判断验证码是否失效 + if (StringUtils.isEmpty(redisCode)) { + return rb.setMsg("验证码失效"); + } else if (!"".equals(redisCode) && !code.equals(redisCode)) { + return rb.setMsg("验证码错误"); + } + return rb.success(); + } + + /** + * @param mobile 手机号 + * @param newPwd 新密码 + * @description: 客户端找回密码 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/9 9:21 + */ + @Override + public ResultBean resetPwdWx(String mobile, String newPwd) { + if (StringUtils.isBlank(mobile) || !RegexUtil.isMobile(mobile)) { + return new ResultBean().fail().setMsg("请输入正确的手机号"); + } + if (StringUtils.isBlank(newPwd)) { + return new ResultBean().fail().setMsg("请输入密码"); + } + return sysUserService.resetPwdWx(mobile, newPwd); + } + + @Override + public ResultBean selectBySid(String sid) { + SysUser sysUser = sysUserService.fetchBySid(sid); + if (sysUser == null) { + sysUser = new SysUser(); + return new ResultBean().fail().setData(sysUser).setMsg("用户不存在"); + } + return new ResultBean().success().setData(sysUser); + } + + /** + * @param end 结束日期 + * @description: 计算两个日期相差多少天 + * @return: + * @Author: dimengzhe + * @Date: 2021/10/12 14:36 + */ + private int days(String end) { + int i = 0; + DateFormat dft = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date star = new Date();//开始时间 + Date endDay = dft.parse(end);//结束时间 + Date nextDay = star; + while (nextDay.before(endDay)) {//当明天不在结束时间之前是终止循环 + Calendar cld = Calendar.getInstance(); + cld.setTime(star); + cld.add(Calendar.DATE, 1); + star = cld.getTime(); + //获得下一天日期字符串 + nextDay = star; + i++; + } + System.out.println("相差天数为：" + i); + } catch (ParseException e) { + e.printStackTrace(); + } + return i; + } + + public static String calcAuthorization(String source, String secretId, String secretKey, String datetime) + throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException { + String signStr = "x-date: " + datetime + "\n" + "x-source: " + source; + Mac mac = Mac.getInstance("HmacSHA1"); + Key sKey = new SecretKeySpec(secretKey.getBytes("UTF-8"), mac.getAlgorithm()); + mac.init(sKey); + byte[] hash = mac.doFinal(signStr.getBytes("UTF-8")); + String sig = Base64.encode(hash); + + String auth = "hmac id=\"" + secretId + "\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"" + sig + "\""; + return auth; + } + + public static String urlencode(Map map) throws UnsupportedEncodingException { + StringBuilder sb = new StringBuilder(); + for (Map.Entry entry : map.entrySet()) { + if (sb.length() > 0) { + sb.append("&"); + } + sb.append(String.format("%s=%s", + URLEncoder.encode(entry.getKey().toString(), "UTF-8"), + URLEncoder.encode(entry.getValue().toString(), "UTF-8") + )); + } + return sb.toString(); + } + +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.java new file mode 100644 index 00000000..cc49630a --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.java @@ -0,0 +1,53 @@ +package com.yxt.supervise.portal.biz.sysuserrole; + +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.anrui.portal.api.sysuserrole.SysUserRole; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleMapper.java
+ * Class: SysUserRoleMapper
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SysUserRoleMapper extends BaseMapper { + + //@Update("update sys_user_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_user_role") + List selectListVo(); + + void deleteByUserSid(String userSid); + + @Delete("delete from sys_user_role where userSid=#{userSid} and roleSid=#{roleSid} ") + void delByUserSidAndRoleSid(@Param("userSid") String userSid,@Param("roleSid") String roleSid); + + List selectByUserSid(@Param("userSid")String userSid); + + @Select("SELECT roleSid FROM sys_user_role WHERE userSid=#{userSid}") + List getUserRoleSidByUserSid(@Param("userSid")String userSid); + + List getUserIdListByRoleSid(@Param("roleList") List roleList); +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.xml new file mode 100644 index 00000000..f291b6da --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + delete from sys_user_role where userSid=#{params} + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleRest.java new file mode 100644 index 00000000..97a96c52 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleRest.java @@ -0,0 +1,113 @@ +package com.yxt.supervise.portal.biz.sysuserrole; + +import com.yxt.anrui.portal.api.sysuserrole.*; +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 io.swagger.annotations.Api; +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 java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleFeignFallback.java
+ * Class: SysUserRoleRest
+ * Description: 用户与角色关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "用户与角色关联表") +@RestController +@RequestMapping("v1/sysuserrole") +public class SysUserRoleRest implements SysUserRoleFeign { + + @Autowired + private SysUserRoleService sysUserRoleService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = sysUserRoleService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody SysUserRoleQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = sysUserRoleService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = sysUserRoleService.listVo(); + return rb.success().setData(list); + } + + @Override + public ResultBean save(SysUserRoleDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysUserRoleService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SysUserRoleDto dto){ + ResultBean rb = ResultBean.fireFail(); + sysUserRoleService.deleteByUserSid(dto.getUserSid()); + String roleSid = dto.getRoleSid(); + if(StringUtils.isBlank(roleSid)){ + return rb.success(); + } + String[] roleSids = roleSid.split(","); + for(String sid:roleSids){ + SysUserRole sysUserRole=new SysUserRole(); + sysUserRole.setRoleSid(sid); + sysUserRole.setUserSid(dto.getUserSid()); + sysUserRoleService.saveOrUpdate(sysUserRole); + } + return rb.success(); + } + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + sysUserRoleService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean delByUserSidAndRoleSid(String userSid, String roleSid) { + ResultBean rb = ResultBean.fireFail(); + sysUserRoleService.delByUserSidAndRoleSid(userSid,roleSid); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SysUserRoleVo vo = sysUserRoleService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean> getUserRoleSidByUserSid(String userSid) { + return sysUserRoleService.getUserRoleSidByUserSid(userSid); + } + + @Override + public ResultBean> getUserIdListByRoleSid(List roleList) { + return sysUserRoleService.getUserIdListByRoleSid(roleList); + } +} diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleService.java new file mode 100644 index 00000000..11dfb442 --- /dev/null +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/sysuserrole/SysUserRoleService.java @@ -0,0 +1,123 @@ +package com.yxt.supervise.portal.biz.sysuserrole; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRole; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleDto; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleQuery; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleVo; +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.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysUserRoleService.java
+ * Class: SysUserRoleService
+ * Description: 用户与角色关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SysUserRoleService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SysUserRoleQuery 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(SysUserRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SysUserRoleQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("userSid", query.getUserSid()); + } + + if (StringUtils.isNotBlank(query.getRoleSid())) { + qw.eq("roleSid", query.getRoleSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SysUserRoleQuery 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(SysUserRoleQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SysUserRoleDto dto){ + SysUserRole entity = new SysUserRole(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SysUserRoleVo fetchByIdVo(String id){ + SysUserRole entity = this.fetchById(id); + SysUserRoleVo vo = new SysUserRoleVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByUserSid(String userSid) { + baseMapper.deleteByUserSid(userSid); + } + + public void delByUserSidAndRoleSid(String userSid, String roleSid) { + baseMapper.delByUserSidAndRoleSid(userSid,roleSid); + } + + public List selectByUserSid(String userSid) { + return baseMapper.selectByUserSid(userSid); + } + /*public void updateUserRole(SysUserRoleDto dto) { + //sysUserRoleService.deleteByUserSid(dto.getUserSid()); + SysUserRole entity = new SysUserRole(); + dto.fillEntity(entity); + this.saveOrUpdate (entity); + }*/ + + public ResultBean> getUserRoleSidByUserSid(String userSid) { + ResultBean> rb = ResultBean.fireFail(); + List stringList = new ArrayList<>(); + stringList = baseMapper.getUserRoleSidByUserSid(userSid); + return rb.success().setData(stringList); + } + + public ResultBean> getUserIdListByRoleSid(List roleList) { + return new ResultBean>().success().setData(baseMapper.getUserIdListByRoleSid(roleList)); + } +} \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/cgdd-tmpl/cgdd.xls b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/resources/cgdd-tmpl/cgdd.xls new file mode 100644 index 0000000000000000000000000000000000000000..3db0b7b5aa87a3cdca01e6020ff67267ae9e3927 GIT binary patch literal 24064 zcmeHv34Bf0_WwRN)6FQ6K_rsgL`Xyu8AQy9c}OH8F$NK2P%+dHNeM9(O^{R#Aw{WD zic-}oDuxP`)?8FuR87^Qebu12|L;2Io^#I~fAqcI|MTAe|IYpFbIw|Ot+m%$d+)XP zKKq<|>ZHrncXoJPV|qt>X2G7TZJD(U&*7dDe>gK1j2nWVtJP`&$rx_`d;AA^;2Crc zMdeu_St3~>QJvc$DUocE?2zn{9FQE5oRI1up$RY-q`FA1NNz~(NFGS_kUWv?${HV(f@sEaOa zEUpt+A-w$JhX-1WXrKaYDkYs6tK!eBt8fv{@vB!yr?_3>ngEQaMuww5N}s?+v*ElR zqXpzkoa-_LCzemw7hxq0-%k)IyRbA^UI5EGvrL>bUqpb6#tr3jfT{nyX!*phAO;*( zER{`WWAMx5ecuDMkj?vqFq7CQ+>aGVjh=%w_EX<|(ekMe*Jz~KD$$Frt=L}2uWSw$ zbIcm`a*Zk2hn5F%X6#3#!E8MGJ=cMagqowE&L}pKZz`l9RiEl#e{|$^$mB?eDmb_u z?l?pff>GxVb#jOFy&<=YYzG&&7X#Pf6u`Evk&cEXuspYS~2@|Z}( zsAHg4&nTnHgm^2MI{}7fvOE@v$o8E!m%R?3m!zjAzdYVcF2`gk`^db1q7*l_3;asP z+oB_f@D4`sWSud3bNKcqXq23A__C?w=SV@^ev}#_1Ipp$z>K zYJ%R<1fKMaGpUbpJsnNb8|owY-?*ICM)W88wt9G9%ch7ju8a#{H`DKihKqbyUU33@V6%oWuPebAk8gVELHwbTT) zG#HBuUHo8p+t;!cTBetA7Hu0b#oPw1(_5ceRN8o{LatDD7nH0r$8Jsot)Q#?JejeF zY885`cvPtf&jEa>#)$mKi{WXYFh*|*Pg0H1|G$jqP-)sj@UuN41@DJPjK!C^_a&cL1zucZ#HskU3=&8o!*rTx;!yC$X<>k)!GbV>tZ^r30_(~TS4|@;T>&44AELZRYtpJV5p;e(V zyqgI;tsafh(~6SEpJS-4cq}Z1`l3~)F}$Ikp}hW*o`M{R733Jw3wEI(K|bpJfZqW> zrfCnfs^!a-+Jn$eXr(LQv$F;ISiW3S^=?>h3{Ow1WsP0KU@yc9dN$DFGvieek{@VQ z&C^TmHiVZ$D{WnT)0fmI!UVlwuc2LjFG(->+0YMy-wg55Cgcn4(@-D5UPC!8Ovn-R zH>CIE=?(F%Ovn-XqanS3r>87@Tq@A*rxJbu2>3&&cUmk9^zQC4su&eh2zZIUz{NdY zhS$>T;%y{3E-v!;pp}#2Ugf2gua)EO5`&&6mP=2DIOfk-fvy}ay)Is$R~gXD%5|yo z(#qH3b>(Q~yQjpcs=P#fw0M`4co|-6Z%Rs)moa*0j#-j+2L9xfGQ3Q_4qmP&=&=YF z#~I3@oaO~BLBG>!%EesHpJvOzpyH15+AHV%^@@~4}fn;o-sl;H(G8{!2yay;o{ z%Ty#sY7f(tZfqKvC>?_s%P!6+Qr2fhI(QmAIINefn4(D8K`)br3JW|Ubi+9-n;aq@ zjy#T7wTDJXxt()I@~oYQmgG$PzVC#~Bmy0_HU4g$ThhDw?9dc$m>dKR5<~ zM;jdD;^L&b7Mr*nCpK|8PHf_GoY=&F|NVDK9w{XRM{OAz_vkAXtfQ2?d5B8MaiUUk zoT!u>XHKanMFx#rUn$x^_}}x?h7B7GJSBg$ZlWR4E|u6Cv$AQV7Z0%w7#Se-`vq-t zi9&?UIDH`^Oji?{gd$65()@^0%o&(t#K(R00xoT~S;EVP-P~N)e*qK2dF{j&aP+?6 zc!!7XlEx-XY^EbbeYa9#5ZiWT*8eCZLJ~q#8u?V{C2A~ECd7C+1c7vzFeeHGVzp;w z8w)}&;Mi!HkebB5DWthfNLIG7VeSPqiIEAZN&K5aTF8V5d(uGghgdrzOji?*jYXE| zSYcCJWO@l9EoDNovW-Re7w}0dnUI>qzbT}(Oo*^Q|2NEOBNI}S_&1w+oWFb>qttS8Z~BL%nEQox^%o zvm(>6L0_+4yk5rSigO0@WhL=t8K>1RE156Lm|n*D_3LIJUzRa{Em0uU7BlsmN-y@N ztRrw7Q!7}@p+^>gl@XP5v5k6(!XNL- z#6;XoGRM*qYbMowRChrVK-^ zf}oW-4xuO;yb#1O?%t3$m7cn0ao%c<-5VlmRIk{A*Tj=FY4K8;1Va;Z9AXjmi~+R#jl zMBB0;s<0)CpBU-X?tG_yqUqGO*fj;|J0;7f8q}@A1EiEANUeh%D%5RN?v0$jshv{V z=Dw-auiJX4TW!9;=8ugt*l9WxwJ>656znv|A&7RzUYC+_y0MU4))X(RFs7!8A#+BKqBP`r2dF=W<45X#G~P6JxbGW(!w1Z`34@PZlUi{9|Mny zUBMp}XI497z0B9Fc3RQVB--@&VNA3iM4RIfecIf-*3_)@dt-oEt;Hth&tlALZA^4S zvs#Oy-7$h0R2PLG{pxCDP+ejea%ZuIA}I9ei)dmXLJT+ltfhJ18H;2gW__m>-O9Z0 zjEQb))_0<4cf2rT;5+I$`i6%Y7%uh}f4p{Lwmll_h|SDurxo3nM4O(V7!w@<(dIbB zKHkpIa0EIV_Xq5UzKEg(YpVF*Yyh$9TGm2W^H-%FP;+)yy;vZ7K^iT1q$Il)SXjh08pO z0KI`kn-p?N{=Qe{*vy=)3E>4}@*Hb=*&S9n$6qUYXG+` z4%KVVths#Q#`W2;Ute)Mzbe6TU}&X{;~QCDh0p)w!L-ng-kZMd-r$SSyld6&H}4d9 z9^bXl^-7Op6H|&Bo-dob_2chV-+bKky#M{s?}zRQe5GAUxBj=!);9UE%iX4p?G!Da zab%!Y?L?ntr!M2kjH_r*4?UA{y+xN*ipTao6Z$vp zv+kAZWBy^oGXn3ex^}(hf#aUfCOpjSxPL^ARpzMb?L#&{@lCSuc(eJ>kEV2+y*T`@ z)n&nsE?G_PJ(?K$bjx19>Eo?_J?0s7(c-VPU)C=2OQ`rYEhL~gGcbII!^Q`BhYDr| zPP>uP=%?G3PaE&r*>`J;rnUj^-`^0-eey|T*Sf=IOu4o@`QVh0xn9a(zmSauKHf>A z?fh@9OV~4|G`D(Q{f_xjhw5y&pAs0@_V%N`&u;b4-=20VDYNqp>-588*Q)LI9#U0~ zz0<0&d3ey)3*HZJ4!x6Mv1xGi!}Mp_2L?Vl%iJtKJX2Y6=c650ez+fF_W}21Tw;`j1QF4otseeW?AQsMj7pJR7$>Ae#d6+cuq{Q1zYBiae9k?%X)z8Ev5-iCg!{PmH; zt|gxi&L5F?dS9=Ukd!&8q3s@)_KM8^;9h(GeuEcxuc{d4dguF~AKC|eT~>PRV#vE2 zPIEm}%_i3C(EVfgRqLnz(0={4zO@f_ES%#wbJOgn%G9Q%7fvOvJ91;foVu@AKXpES zvCD*(w`MN5Yj0bzC?acU+>wr-=8b)I!1nS#yj6bpcKMwy9NutGVCwRdosO(n@XL-- zv0Z!IJml2FYt_ZYU%2&jEBvHl(!s?m_IElr<(Ng!*!TYOJ=pKFlOD77uB~jmA#3KQ zpy+$YZp74l@WkiqJC>PSqg1~v8yXbYE_L5O>i=*ezxvAcBYO&+`W<=A^2}Q% z#*Mh>emCsr{T&bV&sERZerna9zauVeaGTw8%i&?ufBfdw{gKyyo7yqh=gU@K%(d;n`0PogFyg$f2j-4BYa*cXqh1;`oh%k5d*MUfAL0?d;KoOG3UMy}SJL-@=u_ zmt*}i6SJ3G%rDCgv+i5=$1|^4H&yTS|FhqKT|S}VO>0Ziw(elBWc9l`=cj{vHeZkZ zd6=T>_%R*b=7l5|ZmxIf{PAh4Dt>TF+@je0pwIeE#aZuNe&g=Z8}FaLu_1p^VtQcd zgpYdMK6cx;@o={v*R?)>yD)d(sBM=|yfx^LwBR=ecs3ujT)ps%E)yN|w|pC)n%X4y z=eH+4y_s*(vvK^u>NQor`m}Fc|JIP+`Z_2ZT{XA<{Dt_yg3hSl7Y zA0K+0wko5+2cef7&a^8%>^d$n=c&`Ix}$f!5>o8%^5Bh)%eqAeKIpg8ZD-cAtUNl@^tt4!tEaowr$w=?)n2uBO^X{AN_izgvu|H^4iLha_CcGny9 z$%Lffy_S~yO4qEvyL!F9=ecD|2A*@fKDmCsl|xFu-9KVSRrIE}H}>${d}Z*bLl&f8 zYFK&p;MKXU<1TLP7v|8*<5o|fQO^#~eQa;x9mjsVeQ@u0^_K?JQ#yY8%*OP1M`L2f zgsi-Y{Fta6GB$j(@z!U^Yk{ZT_7Y7vQO;d_@|D984)gBM-9P(uQOcRao{jRGZ7A#1 zY<&^C7Ca+2!27cI-OI_<)^>Z9bKbpQ`+mFU+e#i^d+V0UW94S+!#{S4JCS=Wzukcu zvyRVwcVi=EdcpYD*H69tamK#hr`NarD$;vH_uUao>(-fnDS2O?Z5>CRKJI*`XP3*( zhX>BsSpI6p1-})m>tAh=c=n-3p9`_Wwk_UtT>a7Eh?>>O2WM;#z0t*TZ0uW!qkbCx z&ZcJ9Q}>r`%G!L+_teLqKK@1+6^%~~>go;V#$4ifx@^sM(0Ripw0$cdMFo2ODS*aZ zz3dJ}xXr1ZHAOjY+}Y2Z%Nu_`|J2rV7IS`zacmJ6nDWc7j@v?&;qx*-uNbv=`P;`` zM@0P)nY-Cb+4|1XS63b!^XV^(;`?|cEx6QXu_xEsqVFti`M?OiktRD;QryxQ_r*d%X+U=fAp-S z*Mgj8ejY=fr*xQjX|7f9x}!B$8?M@%X!&LOXP+IpqC0a?eGqu&5o~RMht%}yOnRqr zV<%;eos^MQI6iCQ5Slh@EkBWTIKsJ0ZTF|MZ-n)%+!?QIbZ1ueqUv?is*Y6zdK|yF zb7SAXY7@_-b=;)#$P2x6eb23e!P{!Dug&*d@{hDTeTU}G9a(gJ)0RK}y4hs!`H;xo z7PEss_=8(A^uqFbH*PvdG`aI$+MU&{zN^0^Z*jwSzq1K^e^>iORXZ2HZ96P(ZKsJt z++vTuHazg_f-g@^eq0=uXVY)-)K=|Rc5d)yzuM{&*DYt94_yuYaK%cWm@C1TIv(3F z@$)6G)jP8^H+SN)h`!UULyNXYt-S4(HqQC6RoBxIp^J}fzZ;@%cenI|ap^fbe#>w3 zrRw)qzyI_k=w@_TY4r0tg|=;MS3DkfH@SBLr*OlgZ*gv@?A>46I8IBYQ(ahxE) zczdL7DID~kmK%1E#1^SrsD3vk9-+{d5)a=BU%W69AvA4sJTy-h4pJ}>N!}gIaZ*|M@j+)VwhNBn}B2}b#ic0@rbZH4L2inT(m(8J|Q@%Q{3Szm_!fPdlIP|Vuz9E$23%ydk1J{(`HW#OyBN%)eJ z?t1ax?2O{SGK^xq@l9JkKH8fkqeuiUhvfnni52IY_~wsxJQ;iN;DOGSKCc`(awL6c zsDrrFLbu3h)YY!g)!8o+{kO;4uiD zz0`De#9pEcxWT_FIcQHz$yU;l z&SWXxSwRc&m^N{KZ7MYD+V^1E^(3wU z7{{~+g}98*I$4ektJE*%Yi`%1+U6`7Iv^do98P9S&rZ+CA%j6nM4-(~{dD@&X(jz} z8#=W#Nh6P}M2Wr1gBI2%fmfuWax^7tn26+b`P(Zr#m-#NF%P$m=CGxEvg%~ucGyC$ z?A+**WZaTjRDkA|grSfl3)<$^CIQzp&FM7~1?8Mx<0TeOs7>-rzB&w<&cj1<&W)Zo z5z4fl5wvi`@b;t8Qj_2#GO^7tG7`clZ+sT$owAQkw;6al4>+pj@mb{BoU*aWsoP3w zQz1nJ$PQUv;(X+>oH~Q4+Q?N9z?G33Aaq7@@Z>ow22R${uS}=T0z46r<{Ght*SP22 z5JiSw4%Hq6v`Jc(tW0xA<88>AAGGkv&}}8-vuqf5d2!(ir`P69490$I6KaBcQzgd~ z4(AK>n_QHZo934TYLWF`a;q%f%AaR$>O)B04RcmpOd?Ogin$rR%6Z&TRQS|sP5VIG z)a3hx!T3lz8U?}aR25LIMv)fFP{qQg$M>BF&N;s zaQMmcr|DTKvS1g92hwB*g(C`Cu_zmqB#u0Sk{YK$n)C2AulnUcskVh@@&)540E+fU zBMPYTQb8sg+DiBv3K|)OPuHDwK3%uR{7XD2W;eo=ry1T!aHQ(Mr_Ty}zFLRBcfpzd z!a~WOzW>{qUc-CGW$^eA9^aHd&*Cw~pb?KowAl|`W+LYx|2WMZ@NAxX4u5VeQQwXW zlHCVO_YdNl$nM|4=K!|Q3a-F!qgW8GSK|cWY8=NZ@jSOutA>n9|F$o*P_iQa&pH^p zSeLA|p7rY&@TPEKX%a^M%eww-WvDWgt!&&5hrGSCK zfGm+m+6a&p{>O#%Ac$<~#%mxz9P5sLFXky&4?eaDc^0fE`n;HDi9CwiLY@^%;GZH9 zMCEqlBbEShGF>cCVh`&1JRilVMD%+RBAN7&oxn#jsa6Og?R#PRD?*%%&k{0|5DmmU zxt5rE1+Nras$*vg4_XxNRS60dfQ#l zx*niV3GxIKCPDQ9g-ehZAbR^-;PVDVGaCVF0Ek{M5Fj5ww6`umzJRa>)IffKnoE!h z5bf0pl>UHdmr;NM0MT2-0@M%?Esg~!5D;R925JO|UeFct8Uvy@AwWTZ=#^Ok3I;^) zz6wwiK(q!Gpb$Vb@C#5=K=Be33aEnwg#n`8El`F7>LfwU0Ckq22tZvVC=yUt35o*L zO@g8Ub(f&#fO<$!44|G8)B+H_>?xEU3n)>7S_0}NL9GDMqYr_yH6VH!bGpKgj~o4P z{~(U?FwMl@LG{*9+Mtj2M_&^uEwIdH<3EWPC@qoKN6NFJJRCxvHS$s=$OcfF1Sxg$ zY}o*4Bl6iHkK_oN+3U!3(BX3g)L)`>(xI%QL+K1?fK-BuPF`I=1EoAyK!X77N86*< zO#3lz^QHKHEZ)w!LqB$Q{2Wawg1-cNaUO6PG~^d=jr9#6CtcFbN5ds}#us^mr4s!B z(Yu#|y(*s4P2*pG^QVz?_sPMYTD!CG6iS72^Q0|DP# zsi)IXf=72HvRV5`v}qrVR~9b(Fw9|i!W~xubbxJ+vL4Hk5o5tZUmaPX8`G%yzjV+P zL4ia=Fb$bB#E~5|q?0l%)5TGp7pl*YvL%x@)g#2Z>_zhiH5hXX%eA{BWf>Z2C_b8H-0g8|3`F+Ts#N_r(K_ z1rN5p#1XFz5>2*JnTqAkZ<`D7Zyl!WCw&#?zdBzT?(Mu}IqVO8ysa~ER(iNn;K*+3 zSLBmmBpk)$D;jgiM>NjFBkB8q^63z-Eg^s(gMlMHlD7#7NAZU^5&x%1G}iruL}f;R zh+xVi-zLB#$?(er?2(Pcp4kZOigmp+g)mdtlN{Qv{Mli%o%_{wFUJ z^z>($IhYt{VlQqSq)Y;Zp&e8oRL}H~m-b!4u!y1ECrT0gH42kLdWb62yFX9c1sC=uaYJIz4`ym1OErxk(m_$ literal 0 HcmV?d00001 diff --git a/yxt_supervise/supervise-system/pom.xml b/yxt_supervise/supervise-system/pom.xml new file mode 100644 index 00000000..f8fe4bfb --- /dev/null +++ b/yxt_supervise/supervise-system/pom.xml @@ -0,0 +1,24 @@ + + + + yxt_supervise + com.yxt.supervise + 0.0.1 + + 4.0.0 + + supervise-system + pom + + supervise-system-api + supervise-system-biz + + + + 15 + 15 + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/pom.xml b/yxt_supervise/supervise-system/supervise-system-api/pom.xml new file mode 100644 index 00000000..a4e5848b --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-api/pom.xml @@ -0,0 +1,19 @@ + + + + supervise-system + com.yxt.supervise + 0.0.1 + + 4.0.0 + + supervise-system-api + + + 15 + 15 + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/pom.xml b/yxt_supervise/supervise-system/supervise-system-biz/pom.xml new file mode 100644 index 00000000..b5edbd7d --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/pom.xml @@ -0,0 +1,19 @@ + + + + supervise-system + com.yxt.supervise + 0.0.1 + + 4.0.0 + + supervise-system-biz + + + 15 + 15 + + + \ No newline at end of file