From bab3c180908df9e02a356522fa270ccb74a89e90 Mon Sep 17 00:00:00 2001 From: liupopo Date: Fri, 20 Oct 2023 11:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4system-api=E6=BA=90=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt_supervise/supervise-system/pom.xml | 1 - .../supervise-system-api/pom.xml | 56 ---- .../system/appversion/AppVersion.java | 25 -- .../system/appversion/AppVersionDto.java | 22 -- .../system/appversion/AppVersionQuery.java | 8 - .../system/appversion/AppVersionVo.java | 22 -- .../system/config/DictCommonType.java | 267 ------------------ .../system/dictcommon/DictCommon.java | 66 ----- .../dictcommon/DictCommonDetailsVo.java | 66 ----- .../system/dictcommon/DictCommonDto.java | 66 ----- .../system/dictcommon/DictCommonFeign.java | 94 ------ .../dictcommon/DictCommonFeignFallback.java | 88 ------ .../system/dictcommon/DictCommonQuery.java | 64 ----- .../system/dictcommon/DictCommonVo.java | 66 ----- .../supervise/system/dicttype/DictType.java | 62 ---- .../system/dicttype/DictTypeDetailsVo.java | 62 ---- .../system/dicttype/DictTypeDto.java | 62 ---- .../system/dicttype/DictTypeFeign.java | 76 ----- .../dicttype/DictTypeFeignFallback.java | 70 ----- .../system/dicttype/DictTypeQuery.java | 60 ---- .../supervise/system/dicttype/DictTypeVo.java | 62 ---- .../supervise/system/flow/FlowCommentDto.java | 35 --- .../supervise/system/flow/FlowRecordVo.java | 18 -- .../yxt/supervise/system/flow/FlowTask.java | 102 ------- .../system/flow/FlowTaskAllQuery.java | 19 -- .../supervise/system/flow/FlowTaskDto.java | 116 -------- .../supervise/system/flow/FlowTaskQuery.java | 43 --- .../yxt/supervise/system/flow/FlowTaskVo.java | 54 ---- .../yxt/supervise/system/flow/Flowable.java | 8 - .../supervise/system/flow/FlowableFeignS.java | 230 --------------- .../supervise/system/flow/GetNodeQuery.java | 21 -- .../yxt/supervise/system/flow/GetNodeVo.java | 20 -- .../flow/PCHistTaskListAndCommentList.java | 24 -- .../supervise/system/flow/SysProUrlVo.java | 54 ---- .../yxt/supervise/system/flow/TaskQuery.java | 91 ------ .../supervise/system/flow/TaskUserInfo.java | 31 -- .../yxt/supervise/system/flow/app/AppVo.java | 22 -- .../system/flow/app/FlowTaskDoQuery.java | 25 -- .../system/flow/app/FlowTaskDoVo.java | 50 ---- .../system/flow/app/FlowTaskFinishVo.java | 58 ---- .../purchasingrequisition/PrVariables.java | 62 ---- .../PurchasingRequisition.java | 37 --- .../PurchasingRequisitionDetailsVo.java | 33 --- .../PurchasingRequisitionDto.java | 77 ----- .../PurchasingRequisitionFeign.java | 119 -------- .../PurchasingRequisitionFeignFallback.java | 109 ------- .../PurchasingRequisitionQuery.java | 82 ------ .../PurchasingRequisitionVo.java | 73 ----- .../yxt/supervise/system/region/Region.java | 28 -- .../supervise/system/region/RegionFeign.java | 36 --- .../system/region/RegionFeignFallback.java | 12 - .../supervise/system/region/RegionListVo.java | 30 -- .../system/sysfunction/SysFunction.java | 49 ---- .../system/sysfunction/SysFunctionDto.java | 51 ---- .../system/sysfunction/SysFunctionFeign.java | 88 ------ .../sysfunction/SysFunctionFeignFallback.java | 92 ------ .../system/sysfunction/SysFunctionQuery.java | 50 ---- .../system/sysfunction/SysFunctionTreeVo.java | 50 ---- .../system/sysfunction/SysFunctionVo.java | 51 ---- .../system/sysmapping/SaveListDto.java | 21 -- .../system/sysmapping/SysMapping.java | 68 ----- .../sysmapping/SysMappingDetailsVo.java | 68 ----- .../system/sysmapping/SysMappingDto.java | 70 ----- .../system/sysmapping/SysMappingFeign.java | 98 ------- .../sysmapping/SysMappingFeignFallback.java | 93 ------ .../sysmapping/SysMappingInfoQuery.java | 25 -- .../sysmapping/SysMappingInfoQueryBatch.java | 27 -- .../system/sysmapping/SysMappingInfoVo.java | 27 -- .../system/sysmapping/SysMappingListDto.java | 65 ----- .../sysmapping/SysMappingListInfoQuery.java | 13 - .../system/sysmapping/SysMappingQuery.java | 76 ----- .../system/sysmapping/SysMappingVo.java | 76 ----- .../yxt/supervise/system/sysmenu/SysMenu.java | 64 ----- .../supervise/system/sysmenu/SysMenuDto.java | 72 ----- .../system/sysmenu/SysMenuFeign.java | 114 -------- .../system/sysmenu/SysMenuFeignFallback.java | 100 ------- .../system/sysmenu/SysMenuQuery.java | 66 ----- .../system/sysmenu/SysMenuTreeVo.java | 59 ---- .../supervise/system/sysmenu/SysMenuVo.java | 74 ----- .../system/sysmenurole/SysMenuRole.java | 34 --- .../system/sysmenurole/SysMenuRoleDto.java | 32 --- .../system/sysmenurole/SysMenuRoleFeign.java | 67 ----- .../sysmenurole/SysMenuRoleFeignFallback.java | 69 ----- .../system/sysmenurole/SysMenuRoleQuery.java | 40 --- .../system/sysmenurole/SysMenuRoleVo.java | 56 ---- .../AppContactSysOrganizationVo.java | 40 --- .../system/sysorganization/QrCodeVo.java | 23 -- .../system/sysorganization/SysOrgListVo.java | 29 -- .../system/sysorganization/SysOrgStaffVo.java | 17 -- .../system/sysorganization/SysOrgVo.java | 31 -- .../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 | 94 ------ .../yxt/supervise/system/syspost/SysPost.java | 46 --- .../supervise/system/syspost/SysPostDto.java | 44 --- .../system/syspost/SysPostFeign.java | 89 ------ .../system/syspost/SysPostFeignFallback.java | 91 ------ .../system/syspost/SysPostListVo.java | 22 -- .../system/syspost/SysPostQuery.java | 41 --- .../supervise/system/syspost/SysPostVo.java | 52 ---- .../yxt/supervise/system/sysrole/SysRole.java | 48 ---- .../supervise/system/sysrole/SysRoleDto.java | 51 ---- .../system/sysrole/SysRoleFeign.java | 83 ------ .../system/sysrole/SysRoleFeignFallback.java | 91 ------ .../system/sysrole/SysRoleQuery.java | 38 --- .../supervise/system/sysrole/SysRoleVo.java | 47 --- .../sysrolefunction/SysRoleFunction.java | 34 --- .../sysrolefunction/SysRoleFunctionDto.java | 32 --- .../sysrolefunction/SysRoleFunctionFeign.java | 67 ----- .../SysRoleFunctionFeignFallback.java | 69 ----- .../sysrolefunction/SysRoleFunctionQuery.java | 32 --- .../sysrolefunction/SysRoleFunctionVo.java | 32 --- .../supervise/system/syssource/SysSource.java | 76 ----- .../system/syssource/SysSourceDto.java | 76 ----- .../system/syssource/SysSourceFeign.java | 73 ----- .../syssource/SysSourceFeignFallback.java | 81 ------ .../system/syssource/SysSourceQuery.java | 78 ----- .../system/syssource/SysSourceVo.java | 85 ------ .../syssourcefunction/SysSourceFunction.java | 34 --- .../SysSourceFunctionDto.java | 32 --- .../SysSourceFunctionFeign.java | 64 ----- .../SysSourceFunctionFeignFallback.java | 64 ----- .../SysSourceFunctionQuery.java | 32 --- .../SysSourceFunctionVo.java | 32 --- .../system/syssourcemenu/SysSourceMenu.java | 33 --- .../syssourcemenu/SysSourceMenuDto.java | 32 --- .../syssourcemenu/SysSourceMenuFeign.java | 64 ----- .../SysSourceMenuFeignFallback.java | 60 ---- .../syssourcemenu/SysSourceMenuQuery.java | 32 --- .../system/syssourcemenu/SysSourceMenuVo.java | 36 --- .../system/syssourcerole/SysSourceRole.java | 34 --- .../syssourcerole/SysSourceRoleDto.java | 32 --- .../syssourcerole/SysSourceRoleFeign.java | 68 ----- .../SysSourceRoleFeignFallback.java | 69 ----- .../syssourcerole/SysSourceRoleQuery.java | 32 --- .../system/syssourcerole/SysSourceRoleVo.java | 32 --- .../sysstaffinfo/AppContactsDetailsVo.java | 34 --- .../system/sysstaffinfo/PcSysStaffQuery.java | 18 -- .../system/sysstaffinfo/PcSysStaffVo.java | 17 -- .../system/sysstaffinfo/SysStaffQuery.java | 30 -- .../system/sysstaffinfo/SysStaffinfo.java | 175 ------------ .../SysStaffinfoAppContactsSearchVo.java | 34 --- .../SysStaffinfoAppContactsVo.java | 34 --- .../sysstaffinfo/SysStaffinfoDetailsVo.java | 155 ---------- .../system/sysstaffinfo/SysStaffinfoDto.java | 185 ------------ .../sysstaffinfo/SysStaffinfoFeign.java | 154 ---------- .../SysStaffinfoFeignFallback.java | 121 -------- .../sysstaffinfo/SysStaffinfoQuery.java | 50 ---- .../system/sysstaffinfo/SysStaffinfoVo.java | 69 ----- .../system/sysstaffinfo/WxBase64Query.java | 20 -- .../system/sysstaffinfo/WxSysInfoQuery.java | 37 --- .../sysstaffinfo/app/AppSysStaffQuery.java | 27 -- .../sysstaffinfo/app/AppSysStaffVo.java | 30 -- .../system/sysstafforg/SysStaffOrg.java | 46 --- .../sysstafforg/SysStaffOrgDetailsVo.java | 28 -- .../system/sysstafforg/SysStaffOrgDto.java | 42 --- .../system/sysstafforg/SysStaffOrgFeign.java | 112 -------- .../sysstafforg/SysStaffOrgFeignFallback.java | 112 -------- .../system/sysstafforg/SysStaffOrgQuery.java | 44 --- .../system/sysstafforg/SysStaffOrgVo.java | 48 ---- .../system/sysstaffpost/SysStaffPost.java | 47 --- .../sysstaffpost/SysStaffPostDetailsVo.java | 24 -- .../system/sysstaffpost/SysStaffPostDto.java | 36 --- .../sysstaffpost/SysStaffPostFeign.java | 68 ----- .../SysStaffPostFeignFallback.java | 69 ----- .../sysstaffpost/SysStaffPostQuery.java | 46 --- .../system/sysstaffpost/SysStaffPostVo.java | 46 --- .../system/sysuser/ProjectInformationVo.java | 18 -- .../yxt/supervise/system/sysuser/SysUser.java | 77 ----- .../supervise/system/sysuser/SysUserDto.java | 44 --- .../system/sysuser/SysUserFeign.java | 234 --------------- .../system/sysuser/SysUserFeignFallback.java | 222 --------------- .../system/sysuser/SysUserInfoVo.java | 30 -- .../system/sysuser/SysUserListVo.java | 19 -- .../system/sysuser/SysUserQuery.java | 51 ---- .../system/sysuser/SysUserUpdate.java | 15 - .../supervise/system/sysuser/SysUserVo.java | 97 ------- .../supervise/system/sysuser/UserQuery.java | 21 -- .../system/sysuser/UserRoleQuery.java | 19 -- .../system/sysuser/app/AppMySysUserInfo.java | 28 -- .../system/sysuser/app/AppSysUserFeign.java | 86 ------ .../sysuser/app/AppSysUserFeignFallback.java | 68 ----- .../system/sysuser/app/AppUserOrgInfoVo.java | 34 --- .../system/sysuser/app/MyInfoQuery.java | 19 -- .../supervise/system/sysuser/app/OrgList.java | 17 -- .../system/sysuser/wx/SmsVerifyCodeQuery.java | 15 - .../system/sysuser/wx/SysUserLoginVo.java | 15 - .../sysuser/wx/SysUserWxBindMobileDto.java | 18 -- .../system/sysuser/wx/WxHomePageVo.java | 27 -- .../system/sysuser/wx/WxMySysUserInfoVo.java | 23 -- .../system/sysuser/wx/WxSysUserDto.java | 33 --- .../system/sysuser/wx/WxSysUserFeign.java | 116 -------- .../sysuser/wx/WxSysUserFeignFallback.java | 12 - .../sysuser/wx/WxSysUserLoginQuery.java | 29 -- .../system/sysuser/wx/WxSysUserVo.java | 38 --- .../system/sysuserrole/SysUserRole.java | 34 --- .../system/sysuserrole/SysUserRoleDto.java | 32 --- .../system/sysuserrole/SysUserRoleFeign.java | 74 ----- .../sysuserrole/SysUserRoleFeignFallback.java | 81 ------ .../system/sysuserrole/SysUserRoleQuery.java | 32 --- .../system/sysuserrole/SysUserRoleVo.java | 32 --- .../system/sysuserwxauth/SysUserWxAuth.java | 17 -- 208 files changed, 11926 deletions(-) delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/pom.xml delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersion.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/config/DictCommonType.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommon.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictType.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowCommentDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowRecordVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTask.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskAllQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/Flowable.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowableFeignS.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/PCHistTaskListAndCommentList.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/SysProUrlVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskUserInfo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/AppVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskFinishVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisition.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/Region.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionListVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunction.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionTreeVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SaveListDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMapping.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQueryBatch.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListInfoQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenu.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuTreeVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRole.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/AppContactSysOrganizationVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/QrCodeVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgListVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgStaffVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganization.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPost.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostListVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRole.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunction.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSource.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunction.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenu.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRole.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/AppContactsDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxBase64Query.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxSysInfoQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrg.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPost.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDetailsVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/ProjectInformationVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserInfoVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserListVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserRoleQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppMySysUserInfo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppUserOrgInfoVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/MyInfoQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/OrgList.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SmsVerifyCodeQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserLoginVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserWxBindMobileDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxHomePageVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxMySysUserInfoVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserLoginQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRole.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleDto.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeign.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeignFallback.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleQuery.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleVo.java delete mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuth.java diff --git a/yxt_supervise/supervise-system/pom.xml b/yxt_supervise/supervise-system/pom.xml index b9c62e0c..ba647d63 100644 --- a/yxt_supervise/supervise-system/pom.xml +++ b/yxt_supervise/supervise-system/pom.xml @@ -7,7 +7,6 @@ 4.0.0 supervise-system - supervise-system-api supervise-system-biz com.yxt.supervise diff --git a/yxt_supervise/supervise-system/supervise-system-api/pom.xml b/yxt_supervise/supervise-system/supervise-system-api/pom.xml deleted file mode 100644 index 5fd1f243..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - com.yxt - yxt-parent - 0.0.1 - - - 4.0.0 - supervise-system-api - com.yxt.supervise - 0.0.1-SNAPSHOT - - - - com.yxt - yxt-common-core - 0.0.1 - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - org.projectlombok - lombok - 1.18.24 - true - - - com.baomidou - mybatis-plus-boot-starter - - - com.baomidou - mybatis-plus-annotation - - - - - - nexus-releases - http://172.18.0.3:8081/repository/yxt-mvn-releases/ - - - nexus-snapshots - http://172.18.0.3:8081/repository/yxt-mvn-snapshot/ - - - - - \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersion.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersion.java deleted file mode 100644 index 88ef39ef..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersion.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.supervise.system.appversion; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2023/7/17 14:43 - */ -@Data -@TableName("app_version") -public class AppVersion extends BaseEntity { - private static final long serialVersionUID = -1024009882612883351L; - - - private String appName;//应用名称 - private Integer versionCode;//版本编码 - private String versionName;//版本号 - private String downloadUrl;//下载地址 - private String versionInfo;//版本描述 - private Integer isAlpha;//是否内测：0否，1是 - private String fileName; - private boolean forceUpdate; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionDto.java deleted file mode 100644 index d46bbfb6..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.supervise.system.appversion; - -import com.yxt.common.core.dto.Dto; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2023/7/17 14:43 - */ -@Data -public class AppVersionDto implements Dto { - private String id; - private String appName;//应用名称 - private Integer versionCode;//版本编码 - private String versionName;//版本号 - private String downloadUrl;//下载地址 - private String versionInfo;//版本描述 - private Integer isAlpha;//是否内测：0否，1是 - private String fileName; - private boolean forceUpdate; -} - diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionQuery.java deleted file mode 100644 index dab2fe57..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionQuery.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yxt.supervise.system.appversion; - -/** - * @author wangpengfei - * @date 2023/7/17 14:43 - */ -public class AppVersionQuery { -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionVo.java deleted file mode 100644 index 0a7a9457..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/appversion/AppVersionVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.supervise.system.appversion; - -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -/** - * @author wangpengfei - * @date 2023/7/17 14:44 - */ -@Data -public class AppVersionVo implements Vo { - private String id; - private String appName;//应用名称 - private Integer versionCode;//版本编码 - private String versionName;//版本号 - private String downloadUrl;//下载地址 - private String versionInfo;//版本描述 - private Integer isAlpha;//是否内测：0否，1是 - private String fileName; - private boolean forceUpdate; -} - diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/config/DictCommonType.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/config/DictCommonType.java deleted file mode 100644 index f823ab43..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/config/DictCommonType.java +++ /dev/null @@ -1,267 +0,0 @@ -package com.yxt.supervise.system.config; - -import io.swagger.annotations.ApiModelProperty; - -/** - * @author dimengzhe - * @date 2021/7/1 10:23 - * @description 常量值管理 - */ -public class DictCommonType { - - //客户端获取手机验证码redis前缀定义 - public static final String WX_REGIST = "wx-regist-";//注册获取验证码 - public static final String WX_LOGIN = "wx-login-";//登录获取验证码 - public static final String WX_FORGET = "wx-forget-";//忘记密码获取验证码 - public static final String WX_UPDATE = "wx-update-";//忘记密码获取验证码 - public static final String WX_NEW = "wx-new-";//新手机号获取验证码 - - /*供应厂商相关*/ - @ApiModelProperty(value = "供应商分类") - public static final String SUPPLIER_TYPE = "supplierType";//数据字典已添加 - @ApiModelProperty(value = "供应类别") - public static final String SUPPLY_TYPE = "supplyType";//数据字典已添加 - @ApiModelProperty(value = "供应商分组") - public static final String SUPPLIE_RGROUP = "supplierGroup";//数据字典已添加 - - /*供应厂商财务信息相关*/ - @ApiModelProperty(value = "结算币种") - public static final String SETTLEMENT_CURRENCY = "settlementCurrency";//数据字典已添加 - @ApiModelProperty(value = "结算方式") - public static final String SETTLEMENT_WAY = "settlementWay";//数据字典已添加 - @ApiModelProperty(value = "税分类") - public static final String TAX_CLASSIFICATION = "taxClassification";//数据字典已添加 - /*基础信息品牌相关*/ - @ApiModelProperty(value = "品牌类型") - public static final String BRAND_TYPE = "brandType";//数据字典已添加 - @ApiModelProperty(value = "职级（岗位）") - public static final String POSTLEVEL = "postLevel"; - - /*车型、车型配置、车辆信息相关*/ - @ApiModelProperty(value = "车辆类型") - public static final String VEHICLE_TYPE = "vehicleType";//数据字典已添加 - @ApiModelProperty(value = "排放标准") - public static final String EMISSION_STANDARD = "emissionStandard";//数据字典已添加 - @ApiModelProperty(value = "产品线") - public static final String PRODUCT_LINE = "productLine";//数据字典已添加 - @ApiModelProperty(value = "后桥") - public static final String REAR_AXLE = "rearAxle";//数据字典已添加 - @ApiModelProperty(value = "速比") - public static final String SPEED_RATIO = "speedRatio";//数据字典已添加 - @ApiModelProperty(value = "系别") - private static final String SERIES = "series";//数据字典已添加 - @ApiModelProperty(value = "车辆功能") - private static final String VEHICLE_FUNCTION = "vehicleFunction";//数据字典已添加 - @ApiModelProperty(value = "细分市场") - private static final String MARKETSEGMENTS = "marketSegments";//数据字典已添加 - - @ApiModelProperty(value = "车身颜色") - public static final String BODYCOLOR = "bodyColor"; - @ApiModelProperty(value = "缓速器") - public static final String SLOWMACHINE = "slowMachine"; - @ApiModelProperty(value = "后视镜") - public static final String REARVIEWMIRROR = "rearViewMirror"; - @ApiModelProperty(value = "轮胎") - public static final String TIRESIZE = "tireSize"; - @ApiModelProperty(value = "驾驶室") - public static final String SPECIFICATION = "specification"; - @ApiModelProperty(value = "后桥速比") - public static final String REARAXLERATIO = "rearAxleRatio"; - @ApiModelProperty(value = "轮毂材质") - public static final String HUBMATERIAL = "hubMaterial"; - @ApiModelProperty(value = "悬架") - public static final String SUSPENSION = "suspension"; - @ApiModelProperty(value = "座椅") - public static final String SEAT = "seat"; - @ApiModelProperty(value = "鞍座") - public static final String SADDLE = "saddle"; - @ApiModelProperty(value = "轴距") - public static final String WHEELBASE = "wheelbase"; - @ApiModelProperty(value = "保险杠") - public static final String BUMPER = "bumper"; - @ApiModelProperty(value = "配置包") - public static final String CONFIGURINGBAO = "configuringBao"; - @ApiModelProperty(value = "独立热源") - public static final String INDEPENDENTSOURCES = "independentSources"; - @ApiModelProperty(value = "燃料箱") - public static final String FUELTANK = "fuelTank"; - @ApiModelProperty(value = "有无:1有0无") - public static final String WHETHER = "whether"; - - @ApiModelProperty(value = "车辆状态") - public static final String VEHICLE_STATE = "vehicleState"; - @ApiModelProperty(value = "车辆状态（车辆台账）") - public static final String VEHICLE_LEDGER_STATE = "vehicleLedgerState"; - @ApiModelProperty(value = "驱动") - public static final String DRIVER = "driver"; - @ApiModelProperty(value = "马力") - public static final String HORSEPOWER = "horsepower"; - @ApiModelProperty(value = "锁定状态") - public static final String LOCKED_STATE = "lockedState"; - @ApiModelProperty(value = "预计订金日期") - public static final String RESERVE_DEPOSIT_DATE = "reserveDepositDate"; - - - @ApiModelProperty(value = "贷款主体类型") - public static final String LOANTYPE = "loanType"; - @ApiModelProperty(value = "打包项目") - public static final String PACKAGINGPROJECT = "packagingProject"; - @ApiModelProperty(value = "融资项目（比打包项目多一个“配件”）") - public static final String PACKAGINGPROJECTFIN = "packagingProjectFin"; - @ApiModelProperty(value = "变速箱") - public static final String GEARBOX = "gearbox"; - @ApiModelProperty(value = "燃料种类") - public static final String FUELTYPE = "fuelType"; - @ApiModelProperty(value = "版本(车辆需求)") - public static final String VEHICLEVERSION = "vehicleVersion"; - @ApiModelProperty(value = "采购形式") - public static final String PURCHASINGFORM = "purchasingForm"; - /*经销商相关*/ - @ApiModelProperty(value = "经销商分类") - public static final String DISTRIBUTOR_CLASSIFICATION = "distributorClassification";//数据字典已添加 - @ApiModelProperty(value = "经销商类型") - public static final String DISTRIBUTOR_TYPE = "distributorType";//数据字典已添加 - @ApiModelProperty(value = "经销商等级") - public static final String DISTRIBUTOR_LEVEL = "distributorLevel";//数据字典已添加 - @ApiModelProperty(value = "企业性质") - public static final String ENTERPRISE_NATURE = "enterpriseNature";//数据字典已添加 - @ApiModelProperty(value = "登记状态") - public static final String REGIST_STATE = "registState"; - @ApiModelProperty(value = "注册资本单位") - public static final String REGISTEREDCAPITAL_ORG = "registeredCapitalOrg"; - @ApiModelProperty(value = "项目类型") - public static final String PROJECT_TYPE = "projectType"; - /*经销商相关结束*/ - - - @ApiModelProperty(value = "合格证情况：0001虚拟 ，002正式") - public static final String CERTIFICATE_SITUATION = "certificateSituation"; - @ApiModelProperty(value = "客户类型：1个人2企业") - public static final String CUSTOMER_TYPE = "customerType"; - @ApiModelProperty(value = "登记注册号类型") - public static final String REGIST_NUM_TYPE = "registNumType"; - @ApiModelProperty(value = "现居住状况") - public static final String CURRENT_LIVE_STATE = "currentlivestate"; - @ApiModelProperty(value = "教育程度") - public static final String EDUCATION_DEGREE = "educationdegree"; - @ApiModelProperty(value = "雇员类型") - public static final String EMPLOYEE_TYPE = "employeetype"; - @ApiModelProperty(value = "证件类型") - public static final String DOCUMENT_TYPE = "documenttype"; - @ApiModelProperty(value = "行业类别") - public static final String INDUSTRY_TYPE = "industrytype"; - @ApiModelProperty(value = "经济类型") - public static final String ECONOMIC_TYPE = "economictype"; - @ApiModelProperty(value = "组织机构类别") - public static final String ORGANIZATION_TYPE = "organizationtype"; - @ApiModelProperty(value = "组织机构类别细分") - public static final String ORGANIZATION_TYPE_DETAILS = "organizationtypedetails"; - - @ApiModelProperty(value = "是或否") - public static final String IS_TRUE = "isTrue"; - @ApiModelProperty(value = "准驾车型") - public static final String CAR_TYPE = "carType"; - - @ApiModelProperty(value = "与客户关系") - public static final String RELATION_SHIP = "relationship"; - @ApiModelProperty(value = "现工作单位性质") - public static final String ORG_NATURE = "orgNature"; - @ApiModelProperty(value = "主要收入来源") - public static final String INCOME_SOURCE = "incomeSource"; - @ApiModelProperty(value = "职位") - public static final String POSITION = "position"; - @ApiModelProperty(value = "经销商类型") - public static final String DEALERS_TYPE = "dealersType"; - @ApiModelProperty(value = "附件类型") - public static final String ATTACH_TYPE = "attachType"; - @ApiModelProperty(value = "信用记录") - public static final String CREDIT_RECORD = "creditRecord"; - @ApiModelProperty(value = "拟租赁形式l") - public static final String PLANS_TO_LEASE = "plansToLease"; - @ApiModelProperty(value = "去返程货物") - public static final String GO_GOODS = "goGoods"; - @ApiModelProperty(value = "经营业务范围") - public static final String BUSINESSSCOPE = "businessScope"; - /* 客户信息相关*/ - @ApiModelProperty(value = "客户分类") - public static final String CUSTOMER_CLASS = "customerClass"; - @ApiModelProperty(value = "客户来源") - public static final String CUSTOMER_SOURCE = "customerSource"; - @ApiModelProperty(value = "客户等级") - public static final String CUSTOMER_LEVEL = "customerLevel"; - @ApiModelProperty(value = "来访方式") - public static final String VISIT_WAY = "visitWay"; - @ApiModelProperty(value = "跟进状态") - public static final String FOLLOW_STATE = "followState"; - @ApiModelProperty(value = "提醒日期（天）") - public static final String REMIND_DAY = "remindDay"; - @ApiModelProperty(value = "承运货物类型") - public static final String CONSIGNMENT_TYPE = "consignmentType"; - @ApiModelProperty(value = "承运货物（暂为假数据）") - public static final String CONSIGNMENT = "consignment"; - @ApiModelProperty(value = "购车方式") - public static final String PURCHASETYPE = "purchaseType"; - @ApiModelProperty(value = "提车方式") - public static final String SALETYPE = "saleType"; - /* 车辆订单 */ - @ApiModelProperty(value = "单据类型") - public static final String BILLSTYPE = "billsType"; - @ApiModelProperty(value = "合同类型") - public static final String CONTRACTTYPE = "contractType"; - - @ApiModelProperty(value = "主车优惠类型") - public static final String DISCOUNTTYPE = "discountType"; - @ApiModelProperty(value = "还款方式") - public static final String MODEOFREPAY = "modeOfRePay"; - @ApiModelProperty(value = "保证金方式") - public static final String BONDMETHOD = "bondMethod"; - @ApiModelProperty(value = "业务类型") - public static final String BUSINESSTYPE = "businessType"; - @ApiModelProperty(value = "开户银行") - public static final String BANK = "bank"; - @ApiModelProperty(value = "账户类型") - public static final String ACCOUNTTYPE = "accountType"; - @ApiModelProperty(value = "运输货物") - public static final String TRANSPORTCARGO = "transportCargo"; - @ApiModelProperty(value = "结账周期") - public static final String CHECKOUTCYCLE = "checkoutCycle"; - @ApiModelProperty(value = "虚拟订单类型") - public static final String DEPOSITBILLTYPE = "depositBillType"; - @ApiModelProperty(value = "付款方式") - public static final String PAYMENTTYPE = "paymentType"; - - /* 物料相关 */ - @ApiModelProperty(value = "物料分组") - public static final String MATERIAL_GROUP = "materialGroup"; - @ApiModelProperty(value = "物料属性") - public static final String MATERIAL_PROPERTIES = "materialProperties"; - @ApiModelProperty(value = "存货类别") - public static final String STOCK_TYPE = "stockType"; - @ApiModelProperty(value = "基本单位") - public static final String BASIC_UNIT = "basicUnit"; - - /* 合同相关 */ - @ApiModelProperty(value = "人员类型") - public static final String PERSONNEL_TYPE = "personnelType"; - - /* 开票申请单相关 */ - @ApiModelProperty(value = "开票性质") - public static final String INVOICING_NATURE = "invoicingNature"; - - /*员工信息管理相关*/ - @ApiModelProperty(value = "婚姻状况") - public static final String MARITAL_STATUS = "maritalstatus"; - @ApiModelProperty(value = "民族") - public static final String NATIONAL = "national"; - @ApiModelProperty(value = "性别") - public static final String SEX = "sex"; - @ApiModelProperty(value = "政治面貌") - public static final String POLITICAL = "political"; - - - /*资料清单相关*/ - @ApiModelProperty(value = "资料类别") - public static final String DATA_TYPE = "dataType"; - @ApiModelProperty(value = "文件格式") - public static final String FILE_TYPE = "fileType"; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommon.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommon.java deleted file mode 100644 index 8687e3b4..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommon.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dictcommon; - -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: DictCommon.java
- * Class: com.supervise.api.dictcommon.DictCommon
- * Description: 数据字典——数据项.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:28
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据项", description = "数据字典——数据项") -@TableName("dict_common") -public class DictCommon extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("类型code") - private String dictType; // 类型code - @ApiModelProperty("key值") - private String dictKey; // key值 - @ApiModelProperty("value值") - private String dictValue; // value值 - @ApiModelProperty("路径") - private String sidPath; // 路径 - @ApiModelProperty("父级sid") - private String parentSid; // 父级sid - @ApiModelProperty("分组名称") - private String groupName; // 分组名称 - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDetailsVo.java deleted file mode 100644 index 21c94ca9..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDetailsVo.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dictcommon; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictCommonVo.java
- * Class: com.supervise.api.dictcommon.DictCommonVo
- * Description: 数据字典——数据项 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据项 视图数据详情", description = "数据字典——数据项 视图数据详情") -public class DictCommonDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("类型code") - private String dictType; // 类型code - @ApiModelProperty("key值") - private String dictKey; // key值 - @ApiModelProperty("value值") - private String dictValue; // value值 - @ApiModelProperty("路径") - private String sidPath; // 路径 - @ApiModelProperty("父级sid") - private String parentSid; // 父级sid - @ApiModelProperty("分组名称") - private String groupName; // 分组名称 - -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDto.java deleted file mode 100644 index 6281a5cf..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonDto.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dictcommon; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictCommonDto.java
- * Class: com.supervise.api.dictcommon.DictCommonDto
- * Description: 数据字典——数据项 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:28
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据项 数据传输对象", description = "数据字典——数据项 数据传输对象") -public class DictCommonDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("类型code") - private String dictType; // 类型code - @ApiModelProperty("key值") - private String dictKey; // key值 - @ApiModelProperty("value值") - private String dictValue; // value值 - @ApiModelProperty("路径") - private String sidPath; // 路径 - @ApiModelProperty("父级sid") - private String parentSid; // 父级sid - @ApiModelProperty("分组名称") - private String groupName; // 分组名称 - -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java deleted file mode 100644 index 8be2df12..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeign.java +++ /dev/null @@ -1,94 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dictcommon; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import io.swagger.annotations.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: yxt_supervise(宇信通监管)
- * File: DictCommonFeign.java
- * Class: com.supervise.api.dictcommon.DictCommonFeign
- * Description: 数据字典——数据项.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:28
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "数据字典——数据项") -@FeignClient( - contextId = "supervise-system-DictCommon", - name = "supervise-system", - path = "v1/dictcommon", - fallback = DictCommonFeignFallback.class) -public interface DictCommonFeign { - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody DictCommonDto 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); - - @GetMapping("/typeValues") - @ResponseBody - @ApiOperation("下拉框的获取") - ResultBean> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0") String psid); - - @GetMapping("/getFirstDictKeyByType") - @ResponseBody - @ApiOperation("根据数据字典的key获取第一个值（默认值）") - ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid); - - @ResponseBody - @GetMapping("/selectBykey/{key}/{type}") - @ApiOperation(value = "数据字典信息修改时的初始化信息") - public ResultBean selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type); -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java deleted file mode 100644 index 0843bc75..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonFeignFallback.java +++ /dev/null @@ -1,88 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dictcommon; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictCommonFeignFallback.java
- * Class: com.supervise.api.dictcommon.DictCommonFeignFallback
- * Description: 数据字典——数据项.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Component -public class DictCommonFeignFallback implements DictCommonFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/dictcommon/listPage无法访问"); - } - - @Override - public ResultBean save(DictCommonDto dto){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/dictcommon/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/dictcommon/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/dictcommon/fetchDetailsBySid无法访问"); - } - - @Override - public ResultBean> getTypeValues(String type, String psid) { - ResultBean> rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/dictcommon/getTypeValues无法访问"); - } - - @Override - public ResultBean getFirstDictKeyByType(String dictType, String psid) { - return null; - } - - @Override - public ResultBean selectBykey(String key, String type) { - return null; - } -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonQuery.java deleted file mode 100644 index fcf083a6..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonQuery.java +++ /dev/null @@ -1,64 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dictcommon; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictCommonQuery.java
- * Class: com.supervise.api.dictcommon.DictCommonQuery
- * Description: 数据字典——数据项 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:28
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据项 查询条件", description = "数据字典——数据项 查询条件") -public class DictCommonQuery implements Query { - - @ApiModelProperty("类型code") - private String dictType; // 类型code - @ApiModelProperty("key值") - private String dictKey; // key值 - @ApiModelProperty("value值") - private String dictValue; // value值 - @ApiModelProperty("路径") - private String sidPath; // 路径 - @ApiModelProperty("父级sid") - private String parentSid; // 父级sid - @ApiModelProperty("分组名称") - private String groupName; // 分组名称 - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonVo.java deleted file mode 100644 index 68e5856d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dictcommon/DictCommonVo.java +++ /dev/null @@ -1,66 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dictcommon; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictCommonVo.java
- * Class: com.supervise.api.dictcommon.DictCommonVo
- * Description: 数据字典——数据项 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:28
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据项 视图数据对象", description = "数据字典——数据项 视图数据对象") -public class DictCommonVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("类型code") - private String dictType; // 类型code - @ApiModelProperty("key值") - private String dictKey; // key值 - @ApiModelProperty("value值") - private String dictValue; // value值 - @ApiModelProperty("路径") - private String sidPath; // 路径 - @ApiModelProperty("父级sid") - private String parentSid; // 父级sid - @ApiModelProperty("分组名称") - private String groupName; // 分组名称 - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictType.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictType.java deleted file mode 100644 index b9e0bfdf..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictType.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dicttype; - -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: DictType.java
- * Class: com.supervise.api.dicttype.DictType
- * Description: 数据字典——数据类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型", description = "数据字典——数据类型") -@TableName("dict_type") -public class DictType extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("类型代码") - private String dictTypeCode; // 类型代码 - @ApiModelProperty("类型名称") - private String dictTypeName; // 类型名称 - @ApiModelProperty("级别") - private String dictTypeLevel; // 级别 - @ApiModelProperty("名称") - private String name; // 名称 - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDetailsVo.java deleted file mode 100644 index e19e62aa..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDetailsVo.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dicttype; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeVo.java
- * Class: com.supervise.api.dicttype.DictTypeVo
- * Description: 数据字典——数据类型 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型 视图数据详情", description = "数据字典——数据类型 视图数据详情") -public class DictTypeDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("类型代码") - private String dictTypeCode; // 类型代码 - @ApiModelProperty("类型名称") - private String dictTypeName; // 类型名称 - @ApiModelProperty("级别") - private String dictTypeLevel; // 级别 - @ApiModelProperty("名称") - private String name; // 名称 - -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDto.java deleted file mode 100644 index dfdd2d32..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeDto.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dicttype; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeDto.java
- * Class: com.supervise.api.dicttype.DictTypeDto
- * Description: 数据字典——数据类型 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型 数据传输对象", description = "数据字典——数据类型 数据传输对象") -public class DictTypeDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("类型代码") - private String dictTypeCode; // 类型代码 - @ApiModelProperty("类型名称") - private String dictTypeName; // 类型名称 - @ApiModelProperty("级别") - private String dictTypeLevel; // 级别 - @ApiModelProperty("名称") - private String name; // 名称 - -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeign.java deleted file mode 100644 index 627279d1..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeign.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dicttype; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeFeign.java
- * Class: com.supervise.api.dicttype.DictTypeFeign
- * Description: 数据字典——数据类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "数据字典——数据类型") -@FeignClient( - contextId = "yxt-supervise-DictType", - name = "yxt-supervise", - path = "v1/dicttype", - fallback = DictTypeFeignFallback.class) -public interface DictTypeFeign { - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody DictTypeDto 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeignFallback.java deleted file mode 100644 index 389a55ba..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeFeignFallback.java +++ /dev/null @@ -1,70 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dicttype; - -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; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeFeignFallback.java
- * Class: com.supervise.api.dicttype.DictTypeFeignFallback
- * Description: 数据字典——数据类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Component -public class DictTypeFeignFallback implements DictTypeFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/dicttype/listPage无法访问"); - } - - @Override - public ResultBean save(DictTypeDto dto){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/dicttype/fetchDetailsBySid无法访问"); - } -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeQuery.java deleted file mode 100644 index ba7d53e7..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeQuery.java +++ /dev/null @@ -1,60 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dicttype; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeQuery.java
- * Class: com.supervise.api.dicttype.DictTypeQuery
- * Description: 数据字典——数据类型 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型 查询条件", description = "数据字典——数据类型 查询条件") -public class DictTypeQuery implements Query { - - @ApiModelProperty("类型代码") - private String dictTypeCode; // 类型代码 - @ApiModelProperty("类型名称") - private String dictTypeName; // 类型名称 - @ApiModelProperty("级别") - private String dictTypeLevel; // 级别 - @ApiModelProperty("名称") - private String name; // 名称 - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeVo.java deleted file mode 100644 index 91da561f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/dicttype/DictTypeVo.java +++ /dev/null @@ -1,62 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.dicttype; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeVo.java
- * Class: com.supervise.api.dicttype.DictTypeVo
- * Description: 数据字典——数据类型 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型 视图数据对象", description = "数据字典——数据类型 视图数据对象") -public class DictTypeVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("类型代码") - private String dictTypeCode; // 类型代码 - @ApiModelProperty("类型名称") - private String dictTypeName; // 类型名称 - @ApiModelProperty("级别") - private String dictTypeLevel; // 级别 - @ApiModelProperty("名称") - private String name; // 名称 - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowCommentDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowCommentDto.java deleted file mode 100644 index 9eb97699..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowCommentDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yxt.supervise.system.flow; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * @author XuanXuan - * @date 2021/3/28 15:50 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class FlowCommentDto implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 1929734226858491967L; - - /** - * 意见类别 1正常（同意）意见 2退回意见 3 驳回意见 4 委派意见 5 转办意见 6 终止流程 7 撤回流程 - */ - private String type; - - /** - * 意见内容 - */ - private String comment; - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowRecordVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowRecordVo.java deleted file mode 100644 index 81b42e34..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowRecordVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.supervise.system.flow; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; -@Data -public class FlowRecordVo { - private List flowList = new ArrayList<>(); - - public List getFlowList() { - return flowList; - } - - public void setFlowList(List flowList) { - this.flowList = flowList; - } -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTask.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTask.java deleted file mode 100644 index 579cde01..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTask.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.yxt.supervise.system.flow; - -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.io.Serializable; -import java.util.Date; -import java.util.List; - -/** - *

工作流任务

- * - * @author XuanXuan - * @date 2021-04-03 - */ -@ApiModel("工作流任务相关-返回参数") -@Data -public class FlowTask extends BaseEntity implements Serializable { - - @ApiModelProperty("任务编号") - private String taskId; - - @ApiModelProperty("任务名称") - private String taskName; - - @ApiModelProperty("任务Key") - private String taskDefKey; - - @ApiModelProperty("任务执行人Id") - private Long assigneeId; - - @ApiModelProperty("部门名称") - private String deptName; - - @ApiModelProperty("流程发起人部门名称") - private String startDeptName; - - @ApiModelProperty("任务执行人名称") - private String assigneeName; - - @ApiModelProperty("任务执行人头像") - private String assigneeHeadImage; - - @ApiModelProperty("流程发起人Id") - private String startUserId; - - @ApiModelProperty("流程发起人名称") - private String startUserName; - - @ApiModelProperty("流程类型") - private String category; - - @ApiModelProperty("流程变量信息") - private Object procVars; - - @ApiModelProperty("局部变量信息") - private Object taskLocalVars; - - @ApiModelProperty("流程部署编号") - private String deployId; - - @ApiModelProperty("流程ID") - private String procDefId; - - @ApiModelProperty("流程key") - private String procDefKey; - - @ApiModelProperty("流程定义名称") - private String procDefName; - - @ApiModelProperty("流程定义内置使用版本") - private int procDefVersion; - - @ApiModelProperty("流程实例ID") - private String procInsId; - - @ApiModelProperty("历史流程实例ID") - private String hisProcInsId; - - @ApiModelProperty("任务耗时") - private String duration; - - @ApiModelProperty("任务意见") - private FlowCommentDto comment = new FlowCommentDto(); - - @ApiModelProperty("候选执行人") - private String candidate; - - /* @ApiModelProperty("任务创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ) - private Date createTime;*/ - - @ApiModelProperty("任务完成时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date finishTime; - - @ApiModelProperty("环节的办理人信息") - private List taskUserInfos; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskAllQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskAllQuery.java deleted file mode 100644 index e71e806a..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskAllQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.yxt.common.core.query.Query; -import lombok.Data; - -/** - * @author hanweijia - * @date 2021/8/20 13:53 - * @description - */ -@Data -public class FlowTaskAllQuery implements Query { - private static final long serialVersionUID = -7395299971899690002L; - private String proDefName;//流程定义名称 - private String processDefinitionId;//流程定义id - private String startDate;//开始日期 - private String endDate;//结束日期 - private String orgSid;//部门sid -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskDto.java deleted file mode 100644 index 69a10338..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskDto.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; - -/** - *

工作流任务

- * - * @author XuanXuan - * @date 2021-04-03 - */ -@ApiModel("工作流任务相关-返回参数") -@Data -public class FlowTaskDto implements Serializable { - - @ApiModelProperty("任务编号") - private String taskId; - - @ApiModelProperty("任务名称") - private String taskName; - - @ApiModelProperty("任务Key") - private String taskDefKey; - - @ApiModelProperty("任务执行人Id") - private String assigneeSid; - - @ApiModelProperty("部门名称") - private String deptName; - - @ApiModelProperty("流程发起人部门名称") - private String startDeptName; - - @ApiModelProperty("任务执行人名称") - private String assigneeName; - - @ApiModelProperty("流程发起人Id") - private String startUserSid; - - @ApiModelProperty("流程发起人名称") - private String startUserName; - - @ApiModelProperty("流程类型") - private String category; - - @ApiModelProperty("流程变量信息") - private Object procVars; - - @ApiModelProperty("局部变量信息") - private Object taskLocalVars; - - @ApiModelProperty("流程部署编号") - private String deployId; - - @ApiModelProperty("流程ID") - private String procDefId; - - @ApiModelProperty("流程key") - private String procDefKey; - - @ApiModelProperty("流程定义名称") - private String procDefName; - - @ApiModelProperty("流程定义内置使用版本") - private int procDefVersion; - - @ApiModelProperty("流程实例ID") - private String procInsId; - - @ApiModelProperty("历史流程实例ID") - private String hisProcInsId; - - @ApiModelProperty("任务耗时") - private String duration; - - @ApiModelProperty("任务意见") - private FlowCommentDto comment; - - @ApiModelProperty("候选执行人") - private String candidate; - @ApiModelProperty("结束事件ID") - private String endActId; - - @ApiModelProperty("流程创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date processCreateTime; - @ApiModelProperty("任务创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - @ApiModelProperty("任务结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endTime; - - @ApiModelProperty("任务完成时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date finishTime; - @ApiModelProperty("业务表单参数集合") - private Map processVariables; - - /*@ApiModelProperty("手机端参数集合") - private Map appVariables; - - @ApiModelProperty("pc端参数集合") - private Map pcVariables;*/ - - @ApiModelProperty("是否显示撤回按钮(登录用户与待办人是否为同一个)") - private boolean hasRevokeButton = false; - @ApiModelProperty("办理的url") - private SysProUrlVo sysProUrlVo ; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskQuery.java deleted file mode 100644 index d9846846..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskQuery.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModelProperty; - -/** - * @author dimengzhe - * @date 2021/8/20 13:53 - * @description - */ -public class FlowTaskQuery implements Query { - private static final long serialVersionUID = -7395299971899690002L; - @ApiModelProperty(value = "用户sid", required = true) - private String userSid; - @ApiModelProperty(value = "zd", required = true) - private String zd; - @ApiModelProperty(value = "days", required = true) - private String days; - - public String getZd() { - return zd; - } - - public void setZd(String zd) { - this.zd = zd; - } - - public String getDays() { - return days; - } - - public void setDays(String days) { - this.days = days; - } - - public String getUserSid() { - return userSid; - } - - public void setUserSid(String userSid) { - this.userSid = userSid; - } -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java deleted file mode 100644 index 3a110394..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowTaskVo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.yxt.supervise.system.flow; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - *

流程任务

- * - * @author XuanXuan - * @date 2021-04-03 - */ -@ApiModel("工作流任务相关--请求参数") -@Data -public class FlowTaskVo { - - @ApiModelProperty("任务Id") - private String taskId; - - @ApiModelProperty("用户Id") - private String userId; - @ApiModelProperty("用户Sid") - private String userSid; - - @ApiModelProperty("任务意见") - private String comment; - - @ApiModelProperty("流程实例Id") - private String instanceId; - - @ApiModelProperty("节点") - private String targetKey; - - @ApiModelProperty("流程变量信息") - private Map values=new HashMap<>(); - - @ApiModelProperty("审批人") - private String assignee; - - @ApiModelProperty("候选人") - private List candidateUsers=new ArrayList<>(); - - @ApiModelProperty("审批组") - private List candidateGroups=new ArrayList<>(); - private int todoNumber;//代办工作数 - private int pendingWork;//待阅工作数 - private List notice;//公告 - private String[] imageUrl;//轮播图地址 -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/Flowable.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/Flowable.java deleted file mode 100644 index 344009ab..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/Flowable.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.yxt.common.core.domain.BaseEntity; -import lombok.Data; - -@Data -public class Flowable extends BaseEntity { -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowableFeignS.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowableFeignS.java deleted file mode 100644 index ec0cbfc4..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/FlowableFeignS.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -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.system.flow.app.FlowTaskDoQuery; -import com.yxt.supervise.system.flow.app.FlowTaskDoVo; -import com.yxt.supervise.system.flow.app.FlowTaskFinishVo; -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; - -@Api(tags = "Flowable") -@FeignClient( - contextId = "anrui-portal-flow-Flowable", - name = "anrui-portal", - path = "v1/flow") -public interface FlowableFeignS { - /** - * 业务系统发起流程申请 - * - * @param procDefId 流程定义id - * @param userSid 用户sid - * @param variables form参数 - * @return - */ - /* @PostMapping("/businessStart/{procDefId}/{userSid}") - public ResultBean businessStart(@ApiParam(value = "流程定义id") @PathVariable(value = "procDefId") String procDefId, - @ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, - @ApiParam(value = "变量集合,json对象") @RequestBody Map variables); -*/ - /** - * 流程定义列表 一般业务中不需要查询该列表 - * - * @param pageNum 页数 - * @param pageSize 容量 - * @return - */ - @PostMapping("/processPagerList/{userSid}") - public ResultBean processPagerList(@ApiParam(value = "当前页码", required = true) @RequestParam("pageNum") Integer pageNum, - @ApiParam(value = "每页条数", required = true) @RequestParam("pageSize") Integer pageSize); - - /** - * 我的流程 我发起的流程 - * - * @param userSid 用户sid - * @param taskQueryPagerQuery 查询参数 - * @return - */ - @PostMapping("/myprocess/{userSid}") - public ResultBean myprocess(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, - @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery taskQueryPagerQuery); - - /** - * 待办列表 - * - * @param userSid 用户sid - * @param pQuery 查询参数 - * @return - */ - @PostMapping("/todoTaskList/{userSid}") - public ResultBean todoTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery pQuery); - - @ApiOperation(value = "读取xml文件") - @GetMapping("/readXml/{deployId}") - public ResultBean readXml(@ApiParam(value = "流程定义id") @PathVariable(value = "deployId") String deployId); - - /** - * 生成流程图 - * - * @param procInsId 任务ID - */ - @ApiOperation(value = "生成流程图") - @RequestMapping("/flowViewer/{procInsId}") - public ResultBean getFlowViewer(@PathVariable("procInsId") String procInsId); - - /** - * 已办任务的查询 - * - * @param userSid 用户sid - * @param pQuery 查询参数 - * @return - */ - @PostMapping("/doneTaskList/{userSid}") - public ResultBean doneTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery pQuery); - - /** - * 处理待办任务 - * - * @param variables 表单参数 - * @return - */ - /* @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map variables); -*/ - /** - * 流程撤回 - * - * @param userSid 用户sid - * @param flowTaskVo 参数 工作流任务相关--请求参数 - * @return - */ - @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess/{userSid}/{businessSid}") - public ResultBean revokeProcess( - @ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, - @ApiParam(value = "业务sid") @PathVariable(value = "businessSid") String businessSid, - @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); - - /** - * 流程历史流转记录 - * - * @param procInsId 流程实例id - * @param deployId 目前没用 - * @return - */ - @ApiOperation(value = "流程历史流转记录") - @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") - public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId, - @ApiParam(value = "目前没用") @PathVariable(value = "deployId") String deployId); - - /** - * 流程历史流转记录 包含了评论的数据 - * - * @param procInsId 流程实例id - * @param deployId 目前没用 - * @return - */ - @ApiOperation(value = "流程历史流转记录") - @GetMapping(value = "/task/flowRecordAndComment/{procInsId}/{deployId}") - public ResultBean>flowRecordAndComment(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId, - @ApiParam(value = "目前没用") @PathVariable(value = "deployId") String deployId); - - /** - * 驳回任务 - * - * @param flowTaskVo - * @return - */ - @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject/{businessSid}") - public ResultBean taskReject(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid") String businessSid, - @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); - - /* @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess/{businessSid}") - public ResultBean breakProcess(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid") String businessSid, - @RequestBody FlowTaskVo flowTaskVo); -*/ - /** - * 取消申请 - * - * @param flowTaskVo - * @return - */ - @ApiOperation(value = "取消申请") - @PostMapping(value = "/task/stopProcess") - @ResponseBody - ResultBean stopProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); - - /** - * 删除流程实例 - * - * @param procInsId 流程实例id - * @return - */ - @ApiOperation(value = "删除流程实例") - @DeleteMapping(value = "/task/deleteProcess/{procInsId}") - @ResponseBody - ResultBean deleteProcess(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); - - /** - * 待办列表 - * - * @param userSid 用户sid - * @param pQuery 查询参数 - * @return - */ - @ApiOperation(value = "总待办列表") - @PostMapping("/todoAllTaskList/{userSid}") - public ResultBean> todoAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, - @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery pQuery); - - @ApiOperation(value = "业务系统查询待办任务列表数量") - @GetMapping("/getTodoNum/{userSid}") - ResultBean getTodoNum(@PathVariable(value = "userSid") String userSid); - @ApiOperation(value = "业务系统查询待办任务列表数量") - @GetMapping("/getTodoNum/{userSid}/{orgPath}") - ResultBean getTodoNum(@PathVariable(value = "userSid")String userSid, - @PathVariable(value = "orgPath") String orgPath); - - /** - * 已办任务的查询 - * - * @param userSid 用户sid - * @param pQuery 查询参数 - * @return - */ - @ApiOperation(value = "总已办列表") - @PostMapping("/doneAllTaskList/{userSid}") - public ResultBean> doneAllTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, @ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery pQuery); - - /** - * 查询下一环节 - * - * @param taskId 查询参数 - * @return - */ - - @ApiOperation(value = "查询下一环节") - @PostMapping("/getNextTasks/{taskId}") - @ResponseBody - public ResultBean getNextTasks(@ApiParam(value = "taskId") @PathVariable(value = "taskId") String taskId); - - @ApiOperation(value = "移动端总待办列表") - @PostMapping("/todoApp") - public ResultBean> todoApp(@RequestBody PagerQuery pagerQuery); - - @ApiOperation(value = "移动端总已办列表") - @PostMapping("/finishedApp") - ResultBean> finishApp(@RequestBody PagerQuery pagerQuery); - - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeQuery.java deleted file mode 100644 index ea34e3c5..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeQuery.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Map; - -@Data -public class GetNodeQuery implements Query { - private static final long serialVersionUID = -5674867230708197611L; - - @ApiModelProperty(value = "环节定义id") - private String taskDefKey; - @ApiModelProperty(value = "业务sid") - private String businessSid; - - - @ApiModelProperty(value = "分支字段及业务字段") - private Map formVariables; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeVo.java deleted file mode 100644 index 5adaeb8e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/GetNodeVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -@Data -public class GetNodeVo implements Vo { - private static final long serialVersionUID = 8802774014747063504L; - @ApiModelProperty(value = "节点名称") - private String name; - @ApiModelProperty(value = "节点id") - private String id; - @ApiModelProperty(value = "审批组") - private List candidateGroups; - @ApiModelProperty(value = "是否是最后环节") - private String endTask; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/PCHistTaskListAndCommentList.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/PCHistTaskListAndCommentList.java deleted file mode 100644 index 25bd4f11..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/PCHistTaskListAndCommentList.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.fasterxml.jackson.annotation.JsonProperty; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.Map; -@Data -public class PCHistTaskListAndCommentList { - private static final long serialVersionUID = -3272069366532392941L; - @ApiModelProperty(value = "流程状态") - @JsonProperty("state") - private String state; - @ApiModelProperty(value = "时间") - @JsonProperty("time") - private Date time; - @ApiModelProperty(value = "审批记录") - @JsonProperty("flowableRecordVo") - private Map flowableRecordVo; - @ApiModelProperty("流程评论") - @JsonProperty("processCommentVo") - private Map processCommentVo; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/SysProUrlVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/SysProUrlVo.java deleted file mode 100644 index 8446ea28..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/SysProUrlVo.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.yxt.supervise.system.flow; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import lombok.Data; - -/** - * 流程业务表单url对象 SysProUrl - * - * @author XuanXuan Xuan - * @date 2021-03-30 - */ -@Data -@ApiModel("流程业务表单url对象") -public class SysProUrlVo implements Vo { - - /** - * 表单主键 - */ - private String url; - - /** - * 类型办理或者详情 - */ - private String type; - - /** - * 终端：pc/mobile - */ - private String terminal; - /** - * 表单id - */ - private String formId; - /** - * 名称 - */ - private String title; - - /** - * 流程定义id - */ - private String proc_def_id; - - /** - * 节点id - */ - private String taskDefKey; - - /** - * app插件名称（模块名称） - */ - private String modulePluginName; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskQuery.java deleted file mode 100644 index 3946840e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskQuery.java +++ /dev/null @@ -1,91 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.flow; - -import com.yxt.common.core.query.Query; - -/** - * Project: anrui-parent
- * File: TaskQuery.java
- * Class: com.yxt.anrui.portal.biz.flow.TaskQuery
- * Description: <描述类的功能>.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2021/10/27 下午3:36
- * - * @author popo - * @version 1.0 - * @since 1.0 - */ -public class TaskQuery implements Query { - - - private String days; - private String zd1; - private String processDefinitionId; - private String startTime; - private String orgSid; - - public String getOrgSid() { - return orgSid; - } - - public void setOrgSid(String orgSid) { - this.orgSid = orgSid; - } - - public String getZd1() { - return zd1; - } - - public void setZd1(String zd1) { - this.zd1 = zd1; - } - - public String getProcessDefinitionId() { - return processDefinitionId; - } - - public void setProcessDefinitionId(String processDefinitionId) { - this.processDefinitionId = processDefinitionId; - } - - public String getDays() { - return days; - } - - public void setDays(String days) { - this.days = days; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskUserInfo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskUserInfo.java deleted file mode 100644 index 84b67349..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/TaskUserInfo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yxt.supervise.system.flow; - -public class TaskUserInfo { - private String assigneeName; - private String assigneeHeadImage; - private String assigneeSid; - - public String getAssigneeSid() { - return assigneeSid; - } - - public void setAssigneeSid(String assigneeSid) { - this.assigneeSid = assigneeSid; - } - - public String getAssigneeName() { - return assigneeName; - } - - public void setAssigneeName(String assigneeName) { - this.assigneeName = assigneeName; - } - - public String getAssigneeHeadImage() { - return assigneeHeadImage; - } - - public void setAssigneeHeadImage(String assigneeHeadImage) { - this.assigneeHeadImage = assigneeHeadImage; - } -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/AppVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/AppVo.java deleted file mode 100644 index 3708d60e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/AppVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.supervise.system.flow.app; - -import com.yxt.common.core.vo.Vo; -import lombok.Data; - -/** - * @Author dimengzhe - * @Date 2022/7/20 10:54 - * @Description - */ -@Data -public class AppVo implements Vo { - private static final long serialVersionUID = -8153041978260796662L; - - private String path; - private String modulePluginName; - private Integer moduleVersion; - private String msgSid; - private String json; - private String type; - private String moduleAction; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoQuery.java deleted file mode 100644 index 4080e052..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoQuery.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.supervise.system.flow.app; - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @Author dimengzhe - * @Date 2022/7/20 9:43 - * @Description - */ -@Data -public class FlowTaskDoQuery implements Query { - private static final long serialVersionUID = 4327143083035475848L; - @ApiModelProperty("用户sid") - @NotBlank(message = "参数错误：userSid") - private String userSid; - @ApiModelProperty("工作名称") - private String names; - - @ApiModelProperty("组织机构sid") - private String orgPath; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoVo.java deleted file mode 100644 index c051842f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskDoVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.yxt.supervise.system.flow.app; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.yxt.common.core.vo.Vo; -import com.yxt.supervise.system.flow.SysProUrlVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.Map; - -/** - * @Author dimengzhe - * @Date 2022/7/20 9:45 - * @Description 移动待办返回参数 - */ -@Data -public class FlowTaskDoVo implements Vo { - private static final long serialVersionUID = 8771689666940266426L; - @ApiModelProperty(value = "环节名称") - private String taskName; - @ApiModelProperty(value = "发起部门") - private String startDeptName; - @ApiModelProperty(value = "发起人") - private String startUserName; - @ApiModelProperty(value = "工作名称") - private String procDefName; - @ApiModelProperty(value = "提交日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date processCreateTime; - @ApiModelProperty(value = "发起日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTime; - @ApiModelProperty(value = "流程id") - private String deployId; - @ApiModelProperty(value = "流程实例id") - private String procInsId; - @ApiModelProperty(value = "任务id") - private String taskId; - @ApiModelProperty("节点id") - private String taskDefKey; - @ApiModelProperty(value = "app集合") - private AppVo appVariables; - @JsonIgnore - private Map processVariables; - @ApiModelProperty("办理的url") - @JsonIgnore - private SysProUrlVo sysProUrlVo; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskFinishVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskFinishVo.java deleted file mode 100644 index a93ac99a..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/flow/app/FlowTaskFinishVo.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.yxt.supervise.system.flow.app; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.yxt.common.core.vo.Vo; -import com.yxt.supervise.system.flow.SysProUrlVo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.Date; -import java.util.Map; - -/** - * @Author dimengzhe - * @Date 2022/7/29 17:31 - * @Description - */ -@Data -public class FlowTaskFinishVo implements Vo { - private static final long serialVersionUID = -5936470750210770833L; - - @ApiModelProperty(value = "流程id") - private String deployId; - @ApiModelProperty(value = "流程实例id") - private String procInsId; - @ApiModelProperty(value = "任务id") - private String taskId; - @ApiModelProperty("节点id") - private String taskDefKey; - @ApiModelProperty(value = "app集合") - private AppVo appVariables; - @ApiModelProperty(value = "环节名称") - private String taskName; - @ApiModelProperty(value = "发起部门") - private String startDeptName; - @ApiModelProperty(value = "发起人") - private String startUserName; - @ApiModelProperty(value = "工作名称") - private String procDefName; - @ApiModelProperty(value = "提交日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date processCreateTime; - @ApiModelProperty(value = "发起日期") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTime; - @ApiModelProperty("任务结束时间") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endTime; - @JsonIgnore - private Map processVariables; - @ApiModelProperty("办理的url") - @JsonIgnore - private SysProUrlVo sysProUrlVo; - @ApiModelProperty("任务执行人名称") - @JsonProperty("currentHandle") - private String assigneeName; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java deleted file mode 100644 index 8ae5e11b..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.yxt.supervise.system.purchasingrequisition; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.HashMap; -import java.util.Map; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class PrVariables { - /** - * 分公司sid - */ - public static final String ORGPATH="orgPath"; - /** - * 流程定义的id - */ - private String modelId; - /** - * 审批意见 - */ - private String comment; - /** - * 流程实例的id - */ - private String instanceId; - /** - * taskId - */ - private String taskId; - /** - * 当前用户的id - */ - private String userSid; - /** - * 当前用户部门的全路径 - */ - private String orgSidPath; - /** - * 业务sid - */ - private String businessSid; - /** - * 环节定义的ID - */ - private String taskDefKey; - /** - * nextNodeUserSids 下一环节的用户sid - */ - private String nextNodeUserSids; - /** - * 业务参数，按需传递 - */ - private Map formVariables =new HashMap<>(); - /* @ApiModelProperty("机构sid:切换结构使用") - private String orgPath;*/ -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisition.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisition.java deleted file mode 100644 index 251e31fe..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisition.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.yxt.supervise.system.purchasingrequisition; - -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; - - -@Data -@ApiModel(value = "采购申请", description = "采购申请") -@TableName("purchasing_requisition") -public class PurchasingRequisition extends BaseEntity { - private static final long serialVersionUID = 1L; - @ApiModelProperty("商品名称") - private String proname; - @ApiModelProperty("商品类型") - private String protype; - @ApiModelProperty("金额") - private String money; - @ApiModelProperty("用户") - private String user; - @ApiModelProperty("数量") - private String num; - @ApiModelProperty(value = "节点状态") - private String nodeState; - @ApiModelProperty("流程定义的id") - private String procDefId; - @ApiModelProperty("流程实例的id") - private String procInstSid; - @ApiModelProperty(value = "任务id") - private String taskId; - @ApiModelProperty(value = "环节定义的ID") - private String taskDefKey; - @ApiModelProperty(value = "nodeSid") - private String nodeSid; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDetailsVo.java deleted file mode 100644 index 9d50dfff..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDetailsVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yxt.supervise.system.purchasingrequisition; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - - -@Data -@ApiModel(value = "采购申请", description = "采购申请") -public class PurchasingRequisitionDetailsVo implements Vo { - private static final long serialVersionUID = 1L; - @ApiModelProperty("商品名称") - private String proname; - @ApiModelProperty("商品类型") - private String protype; - @ApiModelProperty("金额") - private String money; - @ApiModelProperty("用户") - private String user; - @ApiModelProperty("数量") - private String num; - @ApiModelProperty(value = "节点状态") - private String nodeState; - @ApiModelProperty("流程定义的id") - private String procDefId; - @ApiModelProperty("流程实例的id") - private String procInsId; - @ApiModelProperty(value = "任务id") - private String taskId; - @ApiModelProperty(value = "环节定义的ID") - private String taskDefKey; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDto.java deleted file mode 100644 index cfb2d848..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionDto.java +++ /dev/null @@ -1,77 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.purchasingrequisition; - - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeDto.java
- * Class: com.supervise.api.dicttype.DictTypeDto
- * Description: 数据字典——数据类型 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型 数据传输对象", description = "数据字典——数据类型 数据传输对象") -public class PurchasingRequisitionDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("商品名称") - private String proname; - @ApiModelProperty("商品类型") - private String protype; - @ApiModelProperty("金额") - private String money; - @ApiModelProperty("用户") - private String user; - @ApiModelProperty("数量") - private String num; - @ApiModelProperty(value = "节点状态") - private String nodeState; - @ApiModelProperty("流程定义的id") - private String procDefId; - @ApiModelProperty("流程实例的id") - private String procInsId; - @ApiModelProperty(value = "任务id") - private String taskId; - @ApiModelProperty(value = "环节定义的ID") - private String taskDefKey; - @ApiModelProperty(value = "instanceSid") - private String instanceId; - @ApiModelProperty(value = "comment") - private String comment; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java deleted file mode 100644 index f8a306bc..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java +++ /dev/null @@ -1,119 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.purchasingrequisition; - -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.system.flow.GetNodeQuery; -import com.yxt.supervise.system.flow.GetNodeVo; -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; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeFeign.java
- * Class: com.supervise.api.dicttype.DictTypeFeign
- * Description: 数据字典——数据类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Api(tags = "数据字典——数据类型") -@FeignClient( - contextId = "yxt-supervise-PurchasingRequisition", - name = "yxt-supervise", - path = "v1/pr", - fallback = PurchasingRequisitionFeignFallback.class) -public interface PurchasingRequisitionFeign { - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - @ResponseBody - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - @ResponseBody - public ResultBean save(@RequestBody PurchasingRequisitionDto dto); - @ApiOperation("提交") - @PostMapping("/submit") - @ResponseBody - public ResultBean submit(@RequestBody PurchasingRequisitionDto 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); - - /** flow */ - - @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - @ResponseBody - public ResultBean complete(@Valid @RequestBody PrVariables query); - - @ApiOperation(value = "获取上一个环节") - @GetMapping(value = "/getPreviousNodesForReject") - @ResponseBody - ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); - - @ApiOperation(value = "获取下一个环节") - @GetMapping(value = "/getNextNodesForSubmit") - @ResponseBody - ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); - - @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") - @ResponseBody - public ResultBean taskReject(@Valid @RequestBody PurchasingRequisitionQuery query); - - @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") - @ResponseBody - public ResultBean revokeProcess(@Valid @RequestBody PurchasingRequisitionQuery query); - - @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") - @ResponseBody - public ResultBean breakProcess(@Valid @RequestBody PurchasingRequisitionQuery query); - -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java deleted file mode 100644 index eb460fee..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java +++ /dev/null @@ -1,109 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.purchasingrequisition; - -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.system.flow.GetNodeQuery; -import com.yxt.supervise.system.flow.GetNodeVo; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeFeignFallback.java
- * Class: com.supervise.api.dicttype.DictTypeFeignFallback
- * Description: 数据字典——数据类型.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Component -public class PurchasingRequisitionFeignFallback implements PurchasingRequisitionFeign { - - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/dicttype/listPage无法访问"); - } - - @Override - public ResultBean save(PurchasingRequisitionDto dto){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/save无法访问"); - } - - @Override - public ResultBean submit(PurchasingRequisitionDto dto) { - return null; - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口yxt_supervise/dicttype/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口yxt_supervise/dicttype/fetchDetailsBySid无法访问"); - } - - @Override - public ResultBean complete(PrVariables query) { - return null; - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return null; - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return null; - } - - @Override - public ResultBean taskReject(PurchasingRequisitionQuery query) { - return null; - } - - @Override - public ResultBean revokeProcess(PurchasingRequisitionQuery query) { - return null; - } - - @Override - public ResultBean breakProcess(PurchasingRequisitionQuery query) { - return null; - } -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionQuery.java deleted file mode 100644 index ed6eb2f0..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionQuery.java +++ /dev/null @@ -1,82 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.purchasingrequisition; - - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeQuery.java
- * Class: com.supervise.api.dicttype.DictTypeQuery
- * Description: 数据字典——数据类型 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型 查询条件", description = "数据字典——数据类型 查询条件") -public class PurchasingRequisitionQuery implements Query { - - @ApiModelProperty("商品名称") - private String proname; - @ApiModelProperty("商品类型") - private String protype; - @ApiModelProperty("金额") - private String money; - @ApiModelProperty("用户") - private String user; - @ApiModelProperty("数量") - private String num; - @ApiModelProperty(value = "节点状态") - private String nodeState; - @ApiModelProperty("流程定义的id") - private String procDefId; - @ApiModelProperty("流程实例的id") - private String procInsId; - @ApiModelProperty(value = "任务id") - private String taskId; - @ApiModelProperty(value = "环节定义的ID") - private String taskDefKey; - @ApiModelProperty(value = "usersid") - private String userSid; - @ApiModelProperty(value = "businessSid") - private String businessSid; - @ApiModelProperty(value = "instanceId") - private String instanceId; - /** - * 终止、驳回 - */ - @ApiModelProperty("任务意见") - private String comment; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionVo.java deleted file mode 100644 index 6bdfaac0..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionVo.java +++ /dev/null @@ -1,73 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.purchasingrequisition; - - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt_supervise(宇信通监管)
- * File: DictTypeVo.java
- * Class: com.supervise.api.dicttype.DictTypeVo
- * Description: 数据字典——数据类型 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-11-11 11:40:29
- * - * @author dongjianzhao - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "数据字典——数据类型 视图数据对象", description = "数据字典——数据类型 视图数据对象") -public class PurchasingRequisitionVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("商品名称") - private String proname; - @ApiModelProperty("商品类型") - private String protype; - @ApiModelProperty("金额") - private String money; - @ApiModelProperty("用户") - private String user; - @ApiModelProperty("数量") - private String num; - @ApiModelProperty(value = "节点状态") - private String nodeState; - @ApiModelProperty("流程定义的id") - private String procDefId; - @ApiModelProperty("流程实例的id") - private String procInstSid; - @ApiModelProperty(value = "任务id") - private String taskId; - @ApiModelProperty(value = "环节定义的ID") - private String taskDefKey; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/Region.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/Region.java deleted file mode 100644 index 3f12c74d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/Region.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yxt.supervise.system.region; - -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author dimengzhe - * @Date 2023/1/30 14:14 - * @Description - */ -@Data -public class Region extends BaseEntity { - - private static final long serialVersionUID = -8228110479168648565L; - @ApiModelProperty(value = "上级sid") - private String pSid; - @ApiModelProperty(value = "级别") - private Integer level; - @ApiModelProperty(value = "名称，区域名称") - private String name; - @ApiModelProperty(value = "行政区划代码") - private String districtCode; - @ApiModelProperty(value = "sid全路径") - private String sidPath; - @ApiModelProperty(value = "排序号") - private Integer sortNo; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeign.java deleted file mode 100644 index ebaa352e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeign.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yxt.supervise.system.region; - -import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * @Author dimengzhe - * @Date 2023/1/30 14:19 - * @Description - */ -@FeignClient( - contextId = "supervise-system-Region", - name = "supervise-system", - path = "v1/regions", - fallback = RegionFeignFallback.class) -public interface RegionFeign { - - @ApiOperation("获取省") - @ResponseBody - @GetMapping("/getProvince") - public ResultBean getProvince(); - - @ApiOperation("根据省sid获取该省的所有市") - @ResponseBody - @GetMapping("/getCity") - public ResultBean getCity(@RequestParam("sid") String sid); - - @ApiOperation("根据市sid获取该市的所有县区") - @ResponseBody - @GetMapping("/getCounty") - public ResultBean getCounty(@RequestParam("sid") String sid); -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeignFallback.java deleted file mode 100644 index 2ea96d9e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionFeignFallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yxt.supervise.system.region; - -import org.springframework.stereotype.Component; - -/** - * @Author dimengzhe - * @Date 2023/1/30 14:21 - * @Description - */ -@Component -public class RegionFeignFallback { -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionListVo.java deleted file mode 100644 index ce443cbb..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/region/RegionListVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.supervise.system.region; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * @Author dimengzhe - * @Date 2023/1/30 14:27 - * @Description - */ -@Data -public class RegionListVo implements Vo { - private static final long serialVersionUID = 8014259465244029276L; - - @ApiModelProperty(value = "sid") - private String sid; - @ApiModelProperty(value = "上级sid") - private String pSid; - @ApiModelProperty(value = "级别") - private Integer level; - @ApiModelProperty(value = "名称，区域名称") - private String name; - @ApiModelProperty(value = "行政区划代码") - private String districtCode; - @ApiModelProperty(value = "sid全路径") - private String sidPath; - @ApiModelProperty(value = "排序号") - private Integer sortNo; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunction.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunction.java deleted file mode 100644 index 5bd2a64b..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunction.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionDto.java deleted file mode 100644 index 997d30aa..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeign.java deleted file mode 100644 index bfcafc6b..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeign.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeignFallback.java deleted file mode 100644 index 02fced17..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionFeignFallback.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionQuery.java deleted file mode 100644 index b89be429..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionQuery.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionTreeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionTreeVo.java deleted file mode 100644 index ce8b7afd..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionTreeVo.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionVo.java deleted file mode 100644 index b92613c6..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysfunction/SysFunctionVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SaveListDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SaveListDto.java deleted file mode 100644 index 3a2d4d8e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SaveListDto.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMapping.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMapping.java deleted file mode 100644 index 26674f94..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMapping.java +++ /dev/null @@ -1,68 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDetailsVo.java deleted file mode 100644 index 8752fd4a..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDetailsVo.java +++ /dev/null @@ -1,68 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDto.java deleted file mode 100644 index 0828952b..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingDto.java +++ /dev/null @@ -1,70 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeign.java deleted file mode 100644 index 4ca45875..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeign.java +++ /dev/null @@ -1,98 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeignFallback.java deleted file mode 100644 index dc3813bb..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingFeignFallback.java +++ /dev/null @@ -1,93 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQuery.java deleted file mode 100644 index 2a6affbb..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQuery.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQueryBatch.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQueryBatch.java deleted file mode 100644 index 7b5b20b5..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoQueryBatch.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoVo.java deleted file mode 100644 index d0607e1f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingInfoVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListDto.java deleted file mode 100644 index 35aa1027..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListDto.java +++ /dev/null @@ -1,65 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListInfoQuery.java deleted file mode 100644 index 4ea612f1..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingListInfoQuery.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingQuery.java deleted file mode 100644 index 04734be1..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingQuery.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingVo.java deleted file mode 100644 index 42573edb..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmapping/SysMappingVo.java +++ /dev/null @@ -1,76 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenu.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenu.java deleted file mode 100644 index 946b9a80..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenu.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuDto.java deleted file mode 100644 index 729e6867..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuDto.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeign.java deleted file mode 100644 index c288e5f6..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeign.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeignFallback.java deleted file mode 100644 index d1b9071a..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuFeignFallback.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuQuery.java deleted file mode 100644 index 9cd063a5..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuQuery.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuTreeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuTreeVo.java deleted file mode 100644 index fb677394..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuTreeVo.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuVo.java deleted file mode 100644 index 1e1509cf..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenu/SysMenuVo.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRole.java deleted file mode 100644 index 113446d9..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRole.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleDto.java deleted file mode 100644 index 9586079f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeign.java deleted file mode 100644 index 9841f3ea..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeign.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeignFallback.java deleted file mode 100644 index d7243111..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleFeignFallback.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleQuery.java deleted file mode 100644 index ac5e45c4..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleQuery.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleVo.java deleted file mode 100644 index 5c57f43c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysmenurole/SysMenuRoleVo.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/AppContactSysOrganizationVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/AppContactSysOrganizationVo.java deleted file mode 100644 index bd34e1ac..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/AppContactSysOrganizationVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/QrCodeVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/QrCodeVo.java deleted file mode 100644 index 21c09399..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/QrCodeVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgListVo.java deleted file mode 100644 index dc380c3d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgListVo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgStaffVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgStaffVo.java deleted file mode 100644 index 0d6de932..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgStaffVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgVo.java deleted file mode 100644 index b67ae0a6..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrgVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganization.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganization.java deleted file mode 100644 index b71fde97..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganization.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationDto.java deleted file mode 100644 index 06a74464..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationDto.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java deleted file mode 100644 index 80d8d84a..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeign.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.yxt.supervise.system.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: 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-system-SysOrganization", - name = "supervise-system", - 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeignFallback.java deleted file mode 100644 index fc189319..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationFeignFallback.java +++ /dev/null @@ -1,184 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListQuery.java deleted file mode 100644 index 934d446e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListQuery.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListVo.java deleted file mode 100644 index 8d8e48b8..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListsVo.java deleted file mode 100644 index fed2aa96..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationListsVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationQuery.java deleted file mode 100644 index 12ef5624..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationQuery.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java deleted file mode 100644 index f474aed9..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.yxt.supervise.system.sysorganization; - - -import com.yxt.common.core.vo.Vo; -import com.yxt.supervise.system.sysstaffinfo.SysStaffinfo; -import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo; -import com.yxt.supervise.system.sysuser.SysUserVo; -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: 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("其他编码") - //是否是部门级别 1是 2不是 - private String isOrg="2"; - private String otherCode; - private String mobile; - private String isOpenId; - private String userProjectSid; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPost.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPost.java deleted file mode 100644 index becc7456..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPost.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostDto.java deleted file mode 100644 index 58a7aa7d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostDto.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeign.java deleted file mode 100644 index 77073098..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeign.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeignFallback.java deleted file mode 100644 index 752dfbc3..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostFeignFallback.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostListVo.java deleted file mode 100644 index 75a07abe..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostListVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostQuery.java deleted file mode 100644 index ae037bc3..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostQuery.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostVo.java deleted file mode 100644 index 13e5b65b..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syspost/SysPostVo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRole.java deleted file mode 100644 index c52d93d6..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRole.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleDto.java deleted file mode 100644 index 79be5caf..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeign.java deleted file mode 100644 index 6036dd9f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeign.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.yxt.supervise.system.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: 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-system-SysRole", - name = "supervise-system", - 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeignFallback.java deleted file mode 100644 index fb7c27e1..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleFeignFallback.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleQuery.java deleted file mode 100644 index b8a2ea4c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleQuery.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleVo.java deleted file mode 100644 index 3ead4a04..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrole/SysRoleVo.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunction.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunction.java deleted file mode 100644 index 890f52d3..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunction.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionDto.java deleted file mode 100644 index cc2bf5bf..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeign.java deleted file mode 100644 index 250029a2..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeign.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeignFallback.java deleted file mode 100644 index 7f778ce7..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionFeignFallback.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionQuery.java deleted file mode 100644 index 11e699f7..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionQuery.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionVo.java deleted file mode 100644 index f9bd3430..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysrolefunction/SysRoleFunctionVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSource.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSource.java deleted file mode 100644 index b6e12dbb..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSource.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceDto.java deleted file mode 100644 index ace1460c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceDto.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeign.java deleted file mode 100644 index 793315fc..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeign.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeignFallback.java deleted file mode 100644 index 8f7708a8..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceFeignFallback.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceQuery.java deleted file mode 100644 index 6c83fcdc..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceQuery.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceVo.java deleted file mode 100644 index 8cbb4dbf..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssource/SysSourceVo.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.yxt.supervise.system.syssource; - - -import com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunction.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunction.java deleted file mode 100644 index 83d49740..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunction.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionDto.java deleted file mode 100644 index 87030672..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeign.java deleted file mode 100644 index debe0216..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeign.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeignFallback.java deleted file mode 100644 index d9b75d94..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionFeignFallback.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionQuery.java deleted file mode 100644 index 4021ef33..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionQuery.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionVo.java deleted file mode 100644 index 0eea8960..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcefunction/SysSourceFunctionVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenu.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenu.java deleted file mode 100644 index 0bfe548f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenu.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuDto.java deleted file mode 100644 index 655a02ad..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeign.java deleted file mode 100644 index 6c1f00c0..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeign.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeignFallback.java deleted file mode 100644 index 7be74e83..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuFeignFallback.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuQuery.java deleted file mode 100644 index 2344a093..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuQuery.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuVo.java deleted file mode 100644 index a76b402f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcemenu/SysSourceMenuVo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRole.java deleted file mode 100644 index f0e5e75e..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRole.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleDto.java deleted file mode 100644 index 707d27dd..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeign.java deleted file mode 100644 index 0148310f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeign.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeignFallback.java deleted file mode 100644 index 62d82bbc..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleFeignFallback.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleQuery.java deleted file mode 100644 index 4bcd7a6a..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleQuery.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleVo.java deleted file mode 100644 index 400c4ee5..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/syssourcerole/SysSourceRoleVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/AppContactsDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/AppContactsDetailsVo.java deleted file mode 100644 index 1df8e57c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/AppContactsDetailsVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffQuery.java deleted file mode 100644 index 38b330c8..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffQuery.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffVo.java deleted file mode 100644 index 9a9220ae..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/PcSysStaffVo.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffQuery.java deleted file mode 100644 index 44a0f3fe..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffQuery.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java deleted file mode 100644 index 8a26d6f4..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfo.java +++ /dev/null @@ -1,175 +0,0 @@ -package com.yxt.supervise.system.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: 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; - @ApiModelProperty("微信") - private String openId; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java deleted file mode 100644 index b9851d4d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsVo.java deleted file mode 100644 index db389dd0..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoAppContactsVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDetailsVo.java deleted file mode 100644 index 04c7e9bc..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDetailsVo.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.yxt.supervise.system.sysstaffinfo; - -import com.yxt.supervise.system.sysstafforg.SysStaffOrgDetailsVo; -import com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java deleted file mode 100644 index 5e00ee5b..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoDto.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.yxt.supervise.system.sysstaffinfo; - - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.supervise.system.sysstafforg.SysStaffOrgDto; -import com.yxt.supervise.system.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: 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; - private Integer userType; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java deleted file mode 100644 index c763452d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeign.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.yxt.supervise.system.sysstaffinfo; - -import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery; -import com.yxt.supervise.system.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.apache.ibatis.annotations.Delete; -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: 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); - @ApiOperation("查询所有的员工") - @PostMapping("/getAllStaffinfo") - public ResultBean> getAllStaffinfo(); - @ApiOperation("员工管理分页列表 新") - @PostMapping("/listPageNew") - public ResultBean> listPageNew(@RequestBody PagerQuery pq); - /** - * 员工信息新增保存 - * - * @param dto 数据传输对象 - * @return - */ - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@Valid @RequestBody SysStaffinfoDto dto); - @ApiOperation("新增保存") - @PostMapping("/saveNew") - public ResultBean saveNew(@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); - @ApiOperation("修改保存") - @PostMapping("/updateNew/{sid}") - public ResultBean updateNew(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid); - /** - * 员工信息删除操作，即离职 - * - * @param sysStaffQuery 数据传输对象 - * @return - */ - @ApiOperation("设置离职") - @PostMapping("/del") - public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery); - @ApiOperation("根据sid删除记录") - @DeleteMapping("/delBySid/{sid}") - @ResponseBody - public ResultBean delBySid(@PathVariable("sid")String sid); - - /** - * 员工信息编辑初始化及详情 - * - * @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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java deleted file mode 100644 index 9409fa2d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoFeignFallback.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.yxt.supervise.system.sysstaffinfo; - -import com.yxt.supervise.system.sysstaffinfo.app.AppSysStaffQuery; -import com.yxt.supervise.system.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: 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> getAllStaffinfo() { - return null; - } - - @Override - public ResultBean> listPageNew(PagerQuery pq) { - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui_portal/sysstaffinfo/listPageNew无法访问"); - } - @Override - public ResultBean save(SysStaffinfoDto dto) { - return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/save无法访问"); - } - - @Override - public ResultBean saveNew(SysStaffinfoDto dto) { - return null; - } - - @Override - public ResultBean update(SysStaffinfoDto dto, String sid) { - return ResultBean.fireFail().setMsg("接口anrui_portal/sysstaffinfo/update无法访问"); - } - - @Override - public ResultBean updateNew(SysStaffinfoDto dto, String sid) { - return null; - } - - @Override - public ResultBean del(SysStaffQuery sysStaffQuery) { - return null; - } - - @Override - public ResultBean delBySid(String sid) { - 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java deleted file mode 100644 index 76ce7058..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoQuery.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.yxt.supervise.system.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: 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 orgName; - @ApiModelProperty(value = "所在岗位sid") - private String postSid; - @ApiModelProperty(value = "角色sid") - private String roleSid; - @ApiModelProperty(value = "角色sid") - private String roleName; - @ApiModelProperty(value = "用户名") - private String userName; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java deleted file mode 100644 index 81877bd2..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/SysStaffinfoVo.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yxt.supervise.system.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: 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; - @ApiModelProperty(value = "记录是否可用，1:可用，0:不可用") - private String isEnable; - @ApiModelProperty(value = "部门名") - private String departmentName; - @ApiModelProperty(value = "部门sid") - private String departmentSid; - @ApiModelProperty(value = "岗位sid") - private String postSid; - @ApiModelProperty(value = "岗位名称") - private String userName; - @ApiModelProperty(value = "用户sid") - private String userSid; - @ApiModelProperty(value = "角色") - private String roleName; - @ApiModelProperty(value = "类型code") - private String userType; - @ApiModelProperty(value = "用户类型:1监管、2客户、3银行") - private String userTypeKey; - @ApiModelProperty(value = "微信") - private String openId; - @ApiModelProperty(value = "职位") - private String position; - - -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxBase64Query.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxBase64Query.java deleted file mode 100644 index 848a5626..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxBase64Query.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxSysInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxSysInfoQuery.java deleted file mode 100644 index fe05e109..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/WxSysInfoQuery.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffQuery.java deleted file mode 100644 index a16b8801..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffQuery.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffVo.java deleted file mode 100644 index 6dbec97c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffinfo/app/AppSysStaffVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrg.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrg.java deleted file mode 100644 index 83600d72..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrg.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDetailsVo.java deleted file mode 100644 index 0ccf8a79..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDetailsVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDto.java deleted file mode 100644 index 41b0336d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgDto.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java deleted file mode 100644 index c6fc2001..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeign.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.yxt.supervise.system.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: 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-system-SysStaffOrg", - name = "supervise-system", - 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeignFallback.java deleted file mode 100644 index 3902fbe2..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgFeignFallback.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgQuery.java deleted file mode 100644 index 9f7a1ad1..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgQuery.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgVo.java deleted file mode 100644 index cfdb66af..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstafforg/SysStaffOrgVo.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPost.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPost.java deleted file mode 100644 index b40b829c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPost.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDetailsVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDetailsVo.java deleted file mode 100644 index 3430e538..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDetailsVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDto.java deleted file mode 100644 index 3a04a9e5..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostDto.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeign.java deleted file mode 100644 index 96a408a7..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeign.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeignFallback.java deleted file mode 100644 index b5c26ebf..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostFeignFallback.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostQuery.java deleted file mode 100644 index 2e77b810..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostQuery.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostVo.java deleted file mode 100644 index a6475384..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysstaffpost/SysStaffPostVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/ProjectInformationVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/ProjectInformationVo.java deleted file mode 100644 index 5a15233c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/ProjectInformationVo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.supervise.system.sysuser; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModel; -import lombok.Data; - - -/** - * @author wangpengfei - * @date 2023/4/25 9:29 - */ -@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象") -@Data -public class ProjectInformationVo implements Vo { - private String sid; - //项目名称 - private String entryName; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java deleted file mode 100644 index e9d570cc..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yxt.supervise.system.sysuser; - -import com.baomidou.mybatisplus.annotation.TableField; -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; -import java.util.List; - -/** - * Project: anrui_portal(门户建设)
- * File: SysUser.java
- * Class: 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; - private String openId; - private String appletOpenid; - @TableField(exist = false) - private List roleNames; - private String unionid; - //d订阅状态 - private String subscriptionStatus; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java deleted file mode 100644 index 5d5299c3..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserDto.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.yxt.supervise.system.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: 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; - private String bankMessageSid; - private String openid; - private String sid; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java deleted file mode 100644 index 788e2d43..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java +++ /dev/null @@ -1,234 +0,0 @@ -package com.yxt.supervise.system.sysuser; - -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.yxt.supervise.system.sysstaffinfo.SysStaffinfoVo; -import com.yxt.supervise.system.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: 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-system-SysUser", - name = "supervise-system", - 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(@RequestBody SysUserUpdate sysUserUpdate); - - @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,@RequestParam("verificationCode")String verificationCode); - - /** - * 初始化密码 - * - * @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); - @ApiOperation(value = "获取角色的用户") - @GetMapping(value = "getUserByRoleNoOrgPath") - ResultBean> getUserByRoleNoOrgPath(@SpringQueryMap UserQuery userQuery); -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java deleted file mode 100644 index 46d85447..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeignFallback.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.yxt.supervise.system.sysuser; - -import com.yxt.supervise.system.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: 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(SysUserUpdate sysUserUpdate) { - 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,String verificationCode) { - 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; - } - - @Override - public ResultBean> getUserByRoleNoOrgPath(UserQuery userQuery) { - return null; - } -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserInfoVo.java deleted file mode 100644 index b5b18667..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserInfoVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserListVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserListVo.java deleted file mode 100644 index 3cbf9f8d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserListVo.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserQuery.java deleted file mode 100644 index f5073d09..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserQuery.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java deleted file mode 100644 index 2d27df4c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserUpdate.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.supervise.system.sysuser; - -import lombok.Data; - -/** - * @author feikefei - * @create 2023-08-18-17:19 - */ -@Data -public class SysUserUpdate { - private String original; - private String password; - private String confirmPassword; - private String userSid; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java deleted file mode 100644 index 0c749448..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.yxt.supervise.system.sysuser; - - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.yxt.supervise.system.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; -import java.util.Map; - -/** - * Project: anrui_portal(门户建设)
- * File: SysUserVo.java
- * Class: 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; - private String openid; - @ApiModelProperty("项目sid集合") - private List projectSidList; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java deleted file mode 100644 index e764f937..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserQuery.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserRoleQuery.java deleted file mode 100644 index 8694f72c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/UserRoleQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppMySysUserInfo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppMySysUserInfo.java deleted file mode 100644 index b191aff8..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppMySysUserInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeign.java deleted file mode 100644 index ff15e898..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeign.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.yxt.supervise.system.sysuser.app; - -import com.yxt.supervise.system.sysuser.SysUserQuery; -import com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeignFallback.java deleted file mode 100644 index 4a41afa4..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppSysUserFeignFallback.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.yxt.supervise.system.sysuser.app; - -import com.yxt.supervise.system.sysuser.SysUserQuery; -import com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppUserOrgInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppUserOrgInfoVo.java deleted file mode 100644 index 0d2fb9cd..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/AppUserOrgInfoVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/MyInfoQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/MyInfoQuery.java deleted file mode 100644 index 9e8fcb83..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/MyInfoQuery.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/OrgList.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/OrgList.java deleted file mode 100644 index cd3ae345..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/app/OrgList.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SmsVerifyCodeQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SmsVerifyCodeQuery.java deleted file mode 100644 index 372dfecc..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SmsVerifyCodeQuery.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.supervise.system.sysuser.wx; - -import com.yxt.common.core.query.Query; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SmsVerifyCodeQuery implements Query { - @ApiModelProperty("手机号码") - private String mobile; - @ApiModelProperty("手机验证码") - private String code; - @ApiModelProperty("调用定位") - String callLocation; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserLoginVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserLoginVo.java deleted file mode 100644 index dfcedcb0..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserLoginVo.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yxt.supervise.system.sysuser.wx; - -import com.yxt.common.core.vo.Vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysUserLoginVo implements Vo { - @ApiModelProperty(value = "用户Sid") - private String sysUserSid; - @ApiModelProperty(value = "用户登录时随机生成身份验证字符串") - private String token; - @ApiModelProperty(value = "是否登陆") - private Boolean isLogin; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserWxBindMobileDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserWxBindMobileDto.java deleted file mode 100644 index d15d03a0..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/SysUserWxBindMobileDto.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.supervise.system.sysuser.wx; - -import com.yxt.common.core.dto.Dto; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -public class SysUserWxBindMobileDto implements Dto { - @ApiModelProperty(value = "用户登陆授权Sid") - private String sysUserWxAuthSid; - @ApiModelProperty(value = "手机号") - private String mobile; - @ApiModelProperty(value = "验证码") - private String code; - //微信id - private String openid; - private String unionid; -} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxHomePageVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxHomePageVo.java deleted file mode 100644 index 585f79e3..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxHomePageVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxMySysUserInfoVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxMySysUserInfoVo.java deleted file mode 100644 index af45805f..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxMySysUserInfoVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserDto.java deleted file mode 100644 index 02a39169..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserDto.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeign.java deleted file mode 100644 index 573a2208..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeign.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.yxt.supervise.system.sysuser.wx; - -import com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeignFallback.java deleted file mode 100644 index 601359cb..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserFeignFallback.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserLoginQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserLoginQuery.java deleted file mode 100644 index 2faaf321..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserLoginQuery.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserVo.java deleted file mode 100644 index cc72b831..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/wx/WxSysUserVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.yxt.supervise.system.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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRole.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRole.java deleted file mode 100644 index 01486c44..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRole.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleDto.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleDto.java deleted file mode 100644 index 83a166d2..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleDto.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeign.java deleted file mode 100644 index aa2e19f5..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeign.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeignFallback.java deleted file mode 100644 index 2f03daf7..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleFeignFallback.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleQuery.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleQuery.java deleted file mode 100644 index 6fb22345..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleQuery.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleVo.java deleted file mode 100644 index 42ad219c..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserrole/SysUserRoleVo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yxt.supervise.system.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: 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-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuth.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuth.java deleted file mode 100644 index 39f2bfd0..00000000 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuserwxauth/SysUserWxAuth.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yxt.supervise.system.sysuserwxauth; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -@Data -@TableName("sys_user_wx_auth") -public class SysUserWxAuth extends BaseEntity { - @ApiModelProperty(value = "关联的用户登陆Sid") - private String sysUserSid; - @ApiModelProperty(value = "openid") - private String openid; - @ApiModelProperty(value = "微信登陆唯一标识") - private String unionid; -}