From 8acebf3b5dce93883daac6505a98bc05c661daa5 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 28 Dec 2023 22:53:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E8=AF=A6=E6=83=85=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=93=E5=AE=B6=E7=A0=81base64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hz-pm-api/.idea/.gitignore | 8 - hz-pm-api/.idea/checkstyle-idea.xml | 14 -- hz-pm-api/.idea/compiler.xml | 14 -- hz-pm-api/.idea/eclipseCodeFormatter.xml | 12 -- hz-pm-api/.idea/encodings.xml | 8 - .../.idea/inspectionProfiles/Project_Default.xml | 10 -- hz-pm-api/.idea/jarRepositories.xml | 25 --- hz-pm-api/.idea/misc.xml | 12 -- .../0/0/002597a7f172f343a6cffcd273be74aa895d74b3 | 3 - .../0/2/02999ca52b20720a6dba73a2ea57a018dba90084 | 3 - .../0/3/032c44040c9d507864de35d7170661addf623095 | 0 .../3/a/3a29a241dcf97a75f4de88a48dacd988a7193f67 | 0 .../4/d/4d181ee0ef35161a71fa355047c13e9ab5aa4793 | 0 .../7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5 | 95 ------------ .../8/c/8c928fdb02a7d0f06b9a34c0b545a00ddf44aab7 | 3 - .../9/2/92bb80058f98a2589a95655e976c4c3b31905e3f | 5 - .../a/9/a90097c62f2d5eef81300bceaa14afa9559ec829 | 5 - .../b/7/b7eec6c95fd743ceb0853f62f1870e78ac47fa1d | 0 .../d/3/d39b8ec842398247637f12ea4caf897c9a0a8463 | 15 -- .../d/7/d7146276b7a0a780dc7631a29b70c58f9c37fac3 | 72 --------- .../e/4/e427e2fbf9cff46a15e651e8759e4487828aaa90 | 0 .../e/c/ecd8157d3ccb289d327361f90fcef4d14eddb335 | 5 - .../f/1/f1ece2c596126c2753f07e9c33ac1dee153eca7c | 3 - hz-pm-api/.idea/sonarlint/issuestore/index.pb | 31 ---- hz-pm-api/.idea/vcs.xml | 6 - .../hz/pm/api/common/constant/BaseFieldConst.java | 21 --- .../com/hz/pm/api/common/constant/BizConst.java | 113 -------------- .../com/hz/pm/api/common/constant/BooleanBit.java | 17 -- .../com/hz/pm/api/common/constant/CommonConst.java | 69 --------- .../com/hz/pm/api/common/constant/DefValConst.java | 34 ---- .../com/hz/pm/api/common/constant/DingConst.java | 14 -- .../api/common/constant/ProjectDeclareConst.java | 172 --------------------- .../com/hz/pm/api/common/constant/RegionConst.java | 74 --------- .../pm/api/common/constant/StateMachineConst.java | 14 -- .../api/common/handler/BaseFieldFillHandler.java | 2 +- .../helper/basic/AbstractRegionLimitHelper.java | 22 --- .../common/helper/impl/RegionsCacheHelperImpl.java | 2 +- .../api/common/helper/impl/UserInfoHelperImpl.java | 6 +- .../api/common/model/constant/BaseFieldConst.java | 21 +++ .../hz/pm/api/common/model/constant/BizConst.java | 113 ++++++++++++++ .../pm/api/common/model/constant/BooleanBit.java | 17 ++ .../pm/api/common/model/constant/CommonConst.java | 69 +++++++++ .../pm/api/common/model/constant/DefValConst.java | 34 ++++ .../hz/pm/api/common/model/constant/DingConst.java | 14 ++ .../common/model/constant/ProjectDeclareConst.java | 172 +++++++++++++++++++++ .../pm/api/common/model/constant/RegionConst.java | 74 +++++++++ .../common/model/constant/StateMachineConst.java | 14 ++ .../statemachine/action/ProjectDeclareAction.java | 6 +- .../action/ProjectDeclareChoiceAction.java | 8 +- .../action/ProjectDeclareJNAction.java | 7 +- .../action/ProjectDeclareJYAction.java | 6 +- .../action/ProjectDeclareKFBAction.java | 6 +- .../action/ProjectDeclareLDAction.java | 6 +- .../action/ProjectDeclareLQAction.java | 6 +- .../action/ProjectDeclareQTAction.java | 6 +- .../action/ProjectDeclareQYAction.java | 6 +- .../action/ProjectDeclareSBJAction.java | 6 +- .../action/ProjectDeclareSCAction.java | 6 +- .../action/ProjectDeclareSYAction.java | 6 +- .../action/ProjectDeclareYHAction.java | 6 +- .../builder/ProjectDeclareStateMachineBuilder.java | 2 +- .../ProjectDeclareStateMachineJNBuilder.java | 4 +- .../ProjectDeclareStateMachineJYBuilder.java | 4 +- .../ProjectDeclareStateMachineKFQBuilder.java | 4 +- .../ProjectDeclareStateMachineLDBuilder.java | 4 +- .../ProjectDeclareStateMachineLQBuilder.java | 4 +- .../ProjectDeclareStateMachineQTBuilder.java | 4 +- .../ProjectDeclareStateMachineQYBuilder.java | 4 +- .../ProjectDeclareStateMachineSBJBuilder.java | 4 +- .../ProjectDeclareStateMachineSCBuilder.java | 4 +- .../ProjectDeclareStateMachineSYBuilder.java | 4 +- .../ProjectDeclareStateMachineYHBuilder.java | 4 +- .../common/statemachine/contant/RegionContant.java | 34 ++++ .../statemachine/contants/RegionContant.java | 34 ---- .../event/ProjectStatusChangeEvent.java | 2 +- .../factory/ProjectDeclareGuardFactory.java | 8 +- .../statemachine/util/MachineBuilderFounder.java | 2 +- .../statemachine/util/StateMachineUtils.java | 10 +- .../java/com/hz/pm/api/common/util/BizUtils.java | 2 +- .../com/hz/pm/api/common/util/ExcelDownUtil.java | 2 +- .../dashboard/controller/DashboardController.java | 9 -- .../api/dashboard/handle/CockpitStatsHandler.java | 2 +- .../api/dashboard/handle/ProjectStatusHandler.java | 2 +- .../dashboard/helper/DashboardChartAssembler.java | 2 +- .../api/dashboard/manage/CockpitStatsManage.java | 2 +- .../dashboard/manage/DashboardExpertManage.java | 163 ------------------- .../dashboard/manage/DashboardProjectManage.java | 11 +- .../manage/EarlyWarningStatisticsManage.java | 6 +- .../api/dashboard/manage/FundStatisticsManage.java | 2 +- .../hz/pm/api/datascope/model/DataScopeDTO.java | 2 +- .../impl/DashboardUserDataScopeProviderImpl.java | 2 +- .../impl/ExpertAdminDataScopeProviderImpl.java | 2 +- .../provider/impl/ExpertDataScopeProviderImpl.java | 4 +- .../impl/HigherUserDataScopeProviderImpl.java | 4 +- .../impl/OrdinaryUserDataScopeProviderImpl.java | 2 +- .../impl/OrgAdminDataScopeProviderImpl.java | 2 +- .../impl/RegionAdminDataScopeProviderImpl.java | 4 +- .../impl/SuperAdminDataScopeProviderImpl.java | 4 +- .../impl/VisitoyDataScopeProviderImpl.java | 2 +- .../hz/pm/api/ding/task/EmployeeBatchGetTask.java | 4 +- .../pm/api/ding/task/OrganizationBatchGetTask.java | 3 +- .../expert/assembler/ExpertUserInfoAssembler.java | 2 - .../pm/api/expert/entity/ExpertUserFullInfo.java | 16 +- .../api/expert/helper/PermissionCheckHelper.java | 2 +- .../hz/pm/api/expert/manage/ExpertAdminManage.java | 95 ++---------- .../com/hz/pm/api/expert/manage/ExpertManage.java | 10 +- .../api/expert/manage/ExpertMetaApplyManage.java | 10 -- .../manage/ReviewTemplateSettingsManage.java | 2 +- .../api/expert/mapper/ExpertAdminManageMapper.xml | 35 ----- .../hz/pm/api/expert/model/vo/ExpertDetailVO.java | 11 +- .../expert/service/ExpertAdminManageService.java | 4 +- .../service/impl/ExpertAdminManageServiceImpl.java | 33 ++-- .../expert/service/impl/ExpertInfoServiceImpl.java | 18 +-- .../service/impl/ExpertReviewServiceImpl.java | 2 +- .../java/com/hz/pm/api/external/MhApiClient.java | 73 +++++++++ .../pm/api/external/MhExpertQrCodeGenClient.java | 53 +++++++ .../java/com/hz/pm/api/external/MhFileClient.java | 33 ++++ .../com/hz/pm/api/external/MhUserOrgClient.java | 66 -------- .../api/external/controller/MhSyncController.java | 6 +- .../hz/pm/api/external/model/dto/MhCompanyDTO.java | 22 +++ .../com/hz/pm/api/external/model/dto/MhOrgDTO.java | 24 --- .../pm/api/external/model/dto/MhTechExpertDTO.java | 11 -- .../hz/pm/api/external/model/dto/MhUnitDTO.java | 24 +++ .../api/filemanage/manage/ProjectFileManage.java | 8 +- .../api/gov/manage/GovProjectCollectionManage.java | 8 +- .../hz/pm/api/gov/utils/ProjectCollectionUtil.java | 2 +- .../hz/pm/api/gov/utils/ProjectConvertUtil.java | 6 +- .../com/hz/pm/api/irs/manage/AppIrsManage.java | 2 +- .../com/hz/pm/api/irs/manage/IrsProjectManage.java | 2 +- .../com/hz/pm/api/leave/manage/LeaveManage.java | 3 - .../entity/enumeration/ExpertAttendStatusEnum.java | 4 + .../meeting/entity/vo/InviteExpertListItemVO.java | 5 +- .../api/meeting/helper/MeetingDataScopeHelper.java | 2 +- .../hz/pm/api/meeting/manage/MeetingManage.java | 22 +-- .../service/IMeetingExpertJudgeService.java | 2 +- .../pm/api/meta/helper/ExpertUserInfoHelper.java | 16 -- .../api/meta/helper/ExpertUserInfoHelperImpl.java | 48 ------ .../hz/pm/api/performance/constant/BizConst.java | 70 --------- .../api/performance/constant/ProjectBizConst.java | 72 +++++++++ .../convert/PerformanceAppraisalConveter.java | 3 +- .../api/performance/manage/AppAppraisalManage.java | 4 +- .../performance/manage/IndicatorConfigManage.java | 4 +- .../performance/manage/OrgSelfAppraisalManage.java | 36 ++--- .../manage/PerformanceAppraisalPlanManage.java | 10 +- .../api/performance/manage/ReAppraisalManage.java | 70 ++++----- .../api/performance/manage/RectifyAuditManage.java | 4 +- .../pm/api/performance/manage/RectifyManage.java | 6 +- .../hz/pm/api/performance/manage/VerifyManage.java | 78 +++++----- .../com/hz/pm/api/performance/util/ExcelUtils.java | 34 ++-- .../com/hz/pm/api/portrait/manage/TagManage.java | 4 +- .../converter/ApplicationConverter.java | 6 +- .../projectdeclared/manage/ConstructionManage.java | 6 +- .../manage/ConstructionPlanManage.java | 12 +- .../manage/DeclaredProjectManage.java | 8 +- .../manage/DefaultDeclaredProjectManage.java | 4 +- .../projectdeclared/manage/DelayedApplyManage.java | 8 +- .../manage/FinalAcceptanceManage.java | 8 +- .../pm/api/projectdeclared/manage/IrsManage.java | 5 +- .../projectdeclared/manage/OperationManage.java | 4 +- .../PrequalificationDeclaredProjectManage.java | 6 +- .../manage/ProjectAdjustmentManage.java | 4 +- .../api/projectdeclared/manage/PurchaseManage.java | 4 +- .../manage/ReviewByDeptJointManage.java | 2 +- .../manage/ReviewByProvincialDeptManage.java | 2 +- .../manage/ReviewChecklistManage.java | 6 +- .../model/vo/ProjectContractListVO.java | 2 +- .../model/vo/ProjectDeclaredListItemVO.java | 2 +- .../utils/GenerateProjectCodeUtil.java | 5 +- .../utils/ReStartProcessMapUtil.java | 2 +- .../constant/ImportTemplateConstant.java | 31 ---- .../api/projectlib/constant/ProjectConstant.java | 23 --- .../controller/AnnualPlanController.java | 2 +- .../api/projectlib/enumeration/BizDomainEnum.java | 49 ------ .../api/projectlib/enumeration/CloudTypeEnum.java | 44 ------ .../api/projectlib/enumeration/FourSystemEnum.java | 44 ------ .../api/projectlib/enumeration/InstTypeEnum.java | 59 ------- .../projectlib/enumeration/ProjectLibFlagEnum.java | 29 ---- .../ProjectRenewalApprovalStatusEnum.java | 59 ------- .../projectlib/enumeration/ProjectStatusEnum.java | 97 ------------ .../projectlib/enumeration/ProjectTypeEnum.java | 42 ----- .../projectlib/enumeration/ProjectTypeNewEnum.java | 57 ------- .../enumeration/WarningFlowTypeEnum.java | 60 ------- .../enumeration/WarningNoticeTypeEnum.java | 53 ------- .../enumeration/WarningOperationTypeEnum.java | 57 ------- .../pm/api/projectlib/handle/AnnualPlanHandle.java | 8 +- .../pm/api/projectlib/handle/ArchivedHandle.java | 6 +- .../handle/ConstructionPlanReviewHandle.java | 6 +- .../projectlib/handle/DeptUnitedReviewHandle.java | 6 +- .../handle/PreliminaryPreviewHandle.java | 4 +- .../handle/ProcessExecuteChainHandle.java | 6 +- .../projectlib/handle/ProjectApprovalHandle.java | 8 +- .../projectlib/handle/ProjectDeclareHandle.java | 2 +- .../handle/ProjectFinalInspectionHandle.java | 6 +- .../handle/ProjectPreliminaryInspectionHandle.java | 9 +- .../handle/ProvinceUnitedReviewHandle.java | 6 +- .../projectlib/handle/TenderPurchaseHandle.java | 8 +- .../projectlib/handle/UnitInnerAuditHandle.java | 6 +- .../api/projectlib/manage/AnnualPlanLibManage.java | 10 +- .../api/projectlib/manage/ApplicationManage.java | 4 +- .../projectlib/manage/ProjectCollectionManage.java | 4 +- .../pm/api/projectlib/manage/ProjectLibManage.java | 14 +- .../manage/ProjectRenewalFundManage.java | 12 +- .../model/constant/ImportTemplateConstant.java | 31 ++++ .../projectlib/model/constant/ProjectConstant.java | 23 +++ .../model/dto/ProjectCollectionSaveDTO.java | 2 +- .../model/enumeration/BizDomainEnum.java | 49 ++++++ .../model/enumeration/CloudTypeEnum.java | 44 ++++++ .../model/enumeration/FourSystemEnum.java | 44 ++++++ .../projectlib/model/enumeration/InstTypeEnum.java | 59 +++++++ .../model/enumeration/ProjectLibFlagEnum.java | 29 ++++ .../ProjectRenewalApprovalStatusEnum.java | 59 +++++++ .../model/enumeration/ProjectStatusEnum.java | 97 ++++++++++++ .../model/enumeration/ProjectTypeEnum.java | 42 +++++ .../model/enumeration/ProjectTypeNewEnum.java | 55 +++++++ .../model/enumeration/WarningFlowTypeEnum.java | 60 +++++++ .../model/enumeration/WarningNoticeTypeEnum.java | 53 +++++++ .../enumeration/WarningOperationTypeEnum.java | 57 +++++++ .../projectlib/model/vo/ProjectCollectionVO.java | 2 +- .../api/projectlib/model/vo/ProjectDetailVO.java | 4 +- .../projectlib/model/vo/ProjectLibListItemVO.java | 4 +- .../model/vo/ProjectRenewalFundDeclarationVO.java | 2 +- .../model/vo/ProjectReviewCheckListItemVO.java | 2 +- .../impl/NdProjectStatusChangeServiceImpl.java | 2 +- .../service/impl/ProjectServiceImpl.java | 4 +- .../api/projectlib/utils/ProjectVersionUtil.java | 4 +- .../JoinReviewProvincialBureauServiceImpl.java | 2 +- .../hz/pm/api/safety/manage/SafetyRiskManage.java | 4 +- .../pm/api/safety/model/vo/ProjectMonitorVO.java | 4 +- .../pm/api/scheduler/listener/CcTaskListener.java | 2 +- .../scheduler/listener/EarlyWarningListener.java | 2 +- .../api/scheduler/listener/ProcessEndListener.java | 8 +- .../scheduler/listener/ProcessStartListener.java | 3 +- .../task/CheckProvincialReviewResultTask.java | 9 +- .../scheduler/task/CockpitStatsStatisticsTask.java | 10 +- .../hz/pm/api/scheduler/task/CommonLogTask.java | 4 +- .../task/EarlyWarningInstanceNotStartTask.java | 6 +- .../scheduler/task/EarlyWarningProjectTask.java | 8 +- .../hz/pm/api/scheduler/task/InitProcessTask.java | 7 +- .../scheduler/task/SynProjectCollectionTask.java | 2 +- .../api/scheduler/task/SynProjectCoreBizTask.java | 3 +- .../staging/utils/ProjectStatusFlowMapUtil.java | 2 +- .../hz/pm/api/sys/manage/EarlyWarningManage.java | 6 +- .../java/com/hz/pm/api/sys/manage/MenuManage.java | 6 +- .../pm/api/sys/manage/ProcessStatisticsManage.java | 2 +- .../java/com/hz/pm/api/sys/manage/RoleManage.java | 2 +- .../hz/pm/api/sys/manage/UserGuidanceManage.java | 2 +- .../sys/model/vo/WflowEarlyWarningRecordsVO.java | 6 +- .../hz/pm/api/sys/service/IUserRoleService.java | 2 +- .../pm/api/sys/service/impl/MenuServiceImpl.java | 2 +- .../impl/ProjectEarlyWarningServiceImpl.java | 2 +- .../pm/api/sys/service/impl/RoleServiceImpl.java | 2 +- .../pm/api/todocenter/handle/WithDrawHandle.java | 2 +- .../hz/pm/api/todocenter/manage/HandlerManage.java | 8 +- .../pm/api/todocenter/manage/TodoCenterManage.java | 8 +- .../com/hz/pm/api/user/constant/LoginTypeEnum.java | 32 ---- .../hz/pm/api/user/constant/UserAvailableEnum.java | 19 --- .../pm/api/user/controller/MhUnitController.java | 18 --- .../pm/api/user/controller/UserAuthController.java | 2 +- .../java/com/hz/pm/api/user/entity/MhCompany.java | 38 +++++ .../pm/api/user/entity/enumeration/RoleEnum.java | 79 ---------- .../hz/pm/api/user/manage/SyncMhUserOrgManage.java | 71 ++++----- .../com/hz/pm/api/user/manage/UserInfoManage.java | 4 +- .../com/hz/pm/api/user/mapper/MhCompanyMapper.java | 16 ++ .../com/hz/pm/api/user/mapper/MhCompanyMapper.xml | 5 + .../api/user/model/enumeration/LoginTypeEnum.java | 32 ++++ .../hz/pm/api/user/model/enumeration/RoleEnum.java | 79 ++++++++++ .../user/model/enumeration/UserAvailableEnum.java | 19 +++ .../hz/pm/api/user/model/vo/ResUserDetailVO.java | 4 +- .../com/hz/pm/api/user/model/vo/UserRoleVO.java | 1 - .../auth/agent/AgentLoginUserDetailService.java | 2 +- .../auth/credential/CredentialAuthFilter.java | 2 +- .../auth/credential/CredentialAuthProvider.java | 2 +- .../auth/credential/CredentialAuthToken.java | 2 +- .../CredentialLoginUserDetailService.java | 4 +- .../security/auth/mh/MhLoginUserDetailService.java | 2 +- .../user/security/config/RedisSessionConfig.java | 2 +- .../user/security/config/WebSecurityConfig.java | 3 +- .../api/user/security/model/UserFullInfoDTO.java | 4 +- .../api/user/security/model/UserInfoDetails.java | 4 +- .../hz/pm/api/user/service/IMhCompanyService.java | 30 ++++ .../user/service/impl/MhCompanyServiceImpl.java | 20 +++ .../pm/api/user/task/SyncMhCompanyProperties.java | 28 ++++ .../com/hz/pm/api/user/task/SyncMhCompanyTask.java | 34 ++++ .../com/hz/pm/api/user/util/LoginUserUtil.java | 2 +- .../pm/api/workbench/manage/WorkbenchManage.java | 2 +- hz-pm-api/src/main/resources/application-dev.yml | 12 +- .../test/java/com/hz/pm/api/expert/ExpertTest.java | 27 +--- .../test/java/com/hz/pm/api/irs/EmployeeTest.java | 4 +- .../test/java/com/hz/pm/api/provincial/Test.java | 6 +- .../hz/pm/api/sys/processDef/ProcessDefTest.java | 8 +- .../hz/pm/api/sys/project/ProjectStateTest.java | 3 +- .../hz/pm/api/sys/service/IMenuServiceTest.java | 2 +- .../com/hz/pm/api/todocenter/TodoCenterTest.java | 3 +- .../pmapi/collection/SaveCollectionTest.java | 4 +- .../pmapi/collection/SaveCollectionTest331125.java | 4 +- .../ningdatech/pmapi/employee/EmployeeTest.java | 4 +- .../ningdatech/pmapi/instance/InstanceTest.java | 2 +- .../projectCollection/ProjectCollection2Test.java | 2 +- .../projectCollection/ProjectCollection3Test.java | 2 +- .../projectCollection/ProjectCollectionTest.java | 5 +- .../pmapi/projectCollection/ProjectRemoveTest.java | 25 --- hz-pm-api/src/test/resources/application-dev.yml | 7 +- 302 files changed, 2433 insertions(+), 2999 deletions(-) delete mode 100644 hz-pm-api/.idea/.gitignore delete mode 100644 hz-pm-api/.idea/checkstyle-idea.xml delete mode 100644 hz-pm-api/.idea/compiler.xml delete mode 100644 hz-pm-api/.idea/eclipseCodeFormatter.xml delete mode 100644 hz-pm-api/.idea/encodings.xml delete mode 100644 hz-pm-api/.idea/inspectionProfiles/Project_Default.xml delete mode 100644 hz-pm-api/.idea/jarRepositories.xml delete mode 100644 hz-pm-api/.idea/misc.xml delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/0/0/002597a7f172f343a6cffcd273be74aa895d74b3 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/0/2/02999ca52b20720a6dba73a2ea57a018dba90084 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/0/3/032c44040c9d507864de35d7170661addf623095 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/3/a/3a29a241dcf97a75f4de88a48dacd988a7193f67 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/4/d/4d181ee0ef35161a71fa355047c13e9ab5aa4793 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/8/c/8c928fdb02a7d0f06b9a34c0b545a00ddf44aab7 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/9/2/92bb80058f98a2589a95655e976c4c3b31905e3f delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/a/9/a90097c62f2d5eef81300bceaa14afa9559ec829 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/b/7/b7eec6c95fd743ceb0853f62f1870e78ac47fa1d delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/d/3/d39b8ec842398247637f12ea4caf897c9a0a8463 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/d/7/d7146276b7a0a780dc7631a29b70c58f9c37fac3 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/e/4/e427e2fbf9cff46a15e651e8759e4487828aaa90 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/e/c/ecd8157d3ccb289d327361f90fcef4d14eddb335 delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/f/1/f1ece2c596126c2753f07e9c33ac1dee153eca7c delete mode 100644 hz-pm-api/.idea/sonarlint/issuestore/index.pb delete mode 100644 hz-pm-api/.idea/vcs.xml delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BaseFieldConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/CommonConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DefValConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DingConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/ProjectDeclareConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/RegionConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/constant/StateMachineConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BizConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BooleanBit.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/CommonConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DefValConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DingConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ProjectDeclareConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/StateMachineConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contants/RegionContant.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardExpertManage.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/external/MhApiClient.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/external/MhExpertQrCodeGenClient.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/external/MhFileClient.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/external/MhUserOrgClient.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/external/model/dto/MhCompanyDTO.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/external/model/dto/MhOrgDTO.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/external/model/dto/MhUnitDTO.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/meta/helper/ExpertUserInfoHelper.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/meta/helper/ExpertUserInfoHelperImpl.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/performance/constant/BizConst.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/performance/constant/ProjectBizConst.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/constant/ImportTemplateConstant.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/constant/ProjectConstant.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/BizDomainEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/CloudTypeEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/FourSystemEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/InstTypeEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/ProjectLibFlagEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/ProjectRenewalApprovalStatusEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/ProjectStatusEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/ProjectTypeEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/ProjectTypeNewEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/WarningFlowTypeEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/WarningNoticeTypeEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/enumeration/WarningOperationTypeEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/constant/ImportTemplateConstant.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/constant/ProjectConstant.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/BizDomainEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/CloudTypeEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/FourSystemEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/InstTypeEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectLibFlagEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectRenewalApprovalStatusEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectStatusEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectTypeEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectTypeNewEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/WarningFlowTypeEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/WarningNoticeTypeEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/WarningOperationTypeEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/constant/LoginTypeEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/constant/UserAvailableEnum.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/controller/MhUnitController.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/entity/MhCompany.java delete mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/entity/enumeration/RoleEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/mapper/MhCompanyMapper.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/mapper/MhCompanyMapper.xml create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/model/enumeration/LoginTypeEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/model/enumeration/RoleEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/model/enumeration/UserAvailableEnum.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/service/IMhCompanyService.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/service/impl/MhCompanyServiceImpl.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/task/SyncMhCompanyProperties.java create mode 100644 hz-pm-api/src/main/java/com/hz/pm/api/user/task/SyncMhCompanyTask.java diff --git a/hz-pm-api/.idea/.gitignore b/hz-pm-api/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/hz-pm-api/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/hz-pm-api/.idea/checkstyle-idea.xml b/hz-pm-api/.idea/checkstyle-idea.xml deleted file mode 100644 index 0508403..0000000 --- a/hz-pm-api/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - 10.5.0 - JavaOnly - true - - - \ No newline at end of file diff --git a/hz-pm-api/.idea/compiler.xml b/hz-pm-api/.idea/compiler.xml deleted file mode 100644 index 5439b93..0000000 --- a/hz-pm-api/.idea/compiler.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/hz-pm-api/.idea/eclipseCodeFormatter.xml b/hz-pm-api/.idea/eclipseCodeFormatter.xml deleted file mode 100644 index d868994..0000000 --- a/hz-pm-api/.idea/eclipseCodeFormatter.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/hz-pm-api/.idea/encodings.xml b/hz-pm-api/.idea/encodings.xml deleted file mode 100644 index 7d45135..0000000 --- a/hz-pm-api/.idea/encodings.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/hz-pm-api/.idea/inspectionProfiles/Project_Default.xml b/hz-pm-api/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index b400ae1..0000000 --- a/hz-pm-api/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/hz-pm-api/.idea/jarRepositories.xml b/hz-pm-api/.idea/jarRepositories.xml deleted file mode 100644 index a2e2b69..0000000 --- a/hz-pm-api/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/hz-pm-api/.idea/misc.xml b/hz-pm-api/.idea/misc.xml deleted file mode 100644 index d5cd614..0000000 --- a/hz-pm-api/.idea/misc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/hz-pm-api/.idea/sonarlint/issuestore/0/0/002597a7f172f343a6cffcd273be74aa895d74b3 b/hz-pm-api/.idea/sonarlint/issuestore/0/0/002597a7f172f343a6cffcd273be74aa895d74b3 deleted file mode 100644 index 0c7d268..0000000 --- a/hz-pm-api/.idea/sonarlint/issuestore/0/0/002597a7f172f343a6cffcd273be74aa895d74b3 +++ /dev/null @@ -1,3 +0,0 @@ - -U -java:S1118":Add a private constructor to hide the implicit public one.(۫ \ No newline at end of file diff --git a/hz-pm-api/.idea/sonarlint/issuestore/0/2/02999ca52b20720a6dba73a2ea57a018dba90084 b/hz-pm-api/.idea/sonarlint/issuestore/0/2/02999ca52b20720a6dba73a2ea57a018dba90084 deleted file mode 100644 index 1f74f1e..0000000 --- a/hz-pm-api/.idea/sonarlint/issuestore/0/2/02999ca52b20720a6dba73a2ea57a018dba90084 +++ /dev/null @@ -1,3 +0,0 @@ - -U -java:S1118":Add a private constructor to hide the implicit public one.( \ No newline at end of file diff --git a/hz-pm-api/.idea/sonarlint/issuestore/0/3/032c44040c9d507864de35d7170661addf623095 b/hz-pm-api/.idea/sonarlint/issuestore/0/3/032c44040c9d507864de35d7170661addf623095 deleted file mode 100644 index e69de29..0000000 diff --git a/hz-pm-api/.idea/sonarlint/issuestore/3/a/3a29a241dcf97a75f4de88a48dacd988a7193f67 b/hz-pm-api/.idea/sonarlint/issuestore/3/a/3a29a241dcf97a75f4de88a48dacd988a7193f67 deleted file mode 100644 index e69de29..0000000 diff --git a/hz-pm-api/.idea/sonarlint/issuestore/4/d/4d181ee0ef35161a71fa355047c13e9ab5aa4793 b/hz-pm-api/.idea/sonarlint/issuestore/4/d/4d181ee0ef35161a71fa355047c13e9ab5aa4793 deleted file mode 100644 index e69de29..0000000 diff --git a/hz-pm-api/.idea/sonarlint/issuestore/7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5 b/hz-pm-api/.idea/sonarlint/issuestore/7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5 deleted file mode 100644 index dfefc2b..0000000 --- a/hz-pm-api/.idea/sonarlint/issuestore/7/a/7a4df0ff8172ed96c29e54029f6ecac024700aa5 +++ /dev/null @@ -1,95 +0,0 @@ - -o -java:S1192"SDefine a constant instead of duplicating this literal "Unexpected value: " 3 times.( -n -java:S1192"WDefine a constant instead of duplicating this literal "状态机执行失败!" 3 times.( -e -java:S1192"IDefine a constant instead of duplicating this literal "approve_" 5 times.( -t java:S135"YReduce the total number of break and continue statements in this loop to use at most one.(Î -A -java:S5411"*Use the primitive boolean expression here.( -Z -java:S2583"CChange this condition so that it does not always evaluate to "true"( -W java:S125"src/main/java/com/ningdatech/pmapi/irs/sign/IRSAPIRequest.java,d\7\d7146276b7a0a780dc7631a29b70c58f9c37fac3 \ No newline at end of file diff --git a/hz-pm-api/.idea/vcs.xml b/hz-pm-api/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/hz-pm-api/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BaseFieldConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BaseFieldConst.java deleted file mode 100644 index 928f673..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BaseFieldConst.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.hz.pm.api.common.constant; - -/** - *

- * 创建人修改人基础字段 - *

- * - * @author WendyYang - * @since 17:17 2023/01/29 - */ -public class BaseFieldConst { - - private BaseFieldConst() { - } - - public static final String CREATE_BY = "createBy"; - public static final String UPDATE_BY = "updateBy"; - public static final String CREATE_ON = "createOn"; - public static final String UPDATE_ON = "updateOn"; - -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java deleted file mode 100644 index e7e5fa6..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.hz.pm.api.common.constant; - -import com.ningdatech.basic.model.ApiResponse; - -import java.math.BigDecimal; - -/** - *

- * 业务常量 - *

- * - * @author WendyYang - * @since 13:42 2022/12/1 - */ -public class BizConst { - - private BizConst() { - } - - /** - * SQL查询一条 - */ - public static final String LIMIT_1 = "limit 1"; - - public static final String COOKIE_KEY = "HZPM_SESSION"; - - /** - * 一小时秒数 - **/ - public static final BigDecimal SECONDS_BY_HOUR = new BigDecimal(60 * 60); - - /** - * 十分钟的毫秒数 - */ - public static final long MILLS_10_MIN = 1000L * 60 * 10; - - /** - * 中国行政区划编码 - */ - public static final long ROOT_REGION_CODE = 100000L; - - public static final double D100 = 100.0; - - /** - * 一级行政区划数量 - */ - public static final int NUM_PROVINCE = 34; - - /** - * 默认的父id - */ - public static final long PARENT_ID = 0L; - - /** - * 默认树层级 - */ - public static final int TREE_GRADE = 0; - - /** - * 默认的排序 - */ - public static final int SORT_VALUE = 0; - - /** - * 浙江省的region_id - */ - public static final long ZJ_REGION_CODE = 330000L; - public static final String NINE_AREA_CODE_LAST = "000"; - - /** - * 省/直辖市 level - */ - public static final int GOV_L1 = 1; - - /** - * 市 level - */ - public static final int GOV_L2 = 2; - - /** - * 区/县 level - */ - public static final int GOV_L3 = 3; - - /** - * 密码正则：长度8-20位且至少包含大写字母、小写字母、数字或特殊符号中的任意三种 - */ - public static final String REGEX_PASS = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_]+$)(?![a-z0-9]+$)(?![a-z\\W_]+$)(?![0-9\\W_]+$)[a-zA-Z0-9\\W_]{8,20}$"; - - public static final ApiResponse UNAUTHENTICATED = ApiResponse.of(401, "用户未登录", null); - - public static final int MAX_EXPORT_COUNT = 5000; - - public static final String RESPONSE_KEY_DATA = "data"; - public static final String RESPONSE_KEY_ID = "id"; - public static final String RESPONSE_KEY_DING_CODE = "dingCode"; - public static final String RESPONSE_KEY_MATTER_NAME = "matterName"; - public static final String RESPONSE_KEY_ORG_NAME = "orgName"; - public static final String RESPONSE_KEY_USER_STATE = "userState"; - - public static final String RESPONSE_KEY_AREA_NAME = "areaName"; - public static final String ORG_NAME = "organizationName"; - public static final String ORG_CODE = "organizationCode"; - - public static final String DEV = "dev"; - public static final String PRE = "pre"; - public static final String PROD = "prod"; - - public static final String SAVE_SUCCESS = "保存成功"; - public static final String OP_SUCCESS = "操作成功"; - public static final String OP_FAIL = "操作失败"; - public static final String SAVE_FAIL = "保存失败"; -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java deleted file mode 100644 index 6c49d0a..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.hz.pm.api.common.constant; - -/** - *

- * BooleanBit - *

- * - * @author WendyYang - * @since 16:12 2023/12/15 - */ -public interface BooleanBit { - - int TRUE = 1; - - int FALSE = 0; - -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/CommonConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/CommonConst.java deleted file mode 100644 index 2cbff53..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/CommonConst.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.hz.pm.api.common.constant; - -/** - * @description: 常量 - * @author: LiuXinXin - * @date: 2022/5/5 17:31 - */ -public interface CommonConst { - - String COOKIE_KEY = "HZPM_JSESSION"; - - Integer EXPORT_PAGE_NUMBER = 1; - Integer EXPORT_PAGE_SIZE = 100000; - String CALL_STATUS = "status"; - String CALL_STATUS_OK_VALUE = "ok"; - - Integer COMMENT_MAX_SIZE = 163; - Integer SUB_COMMENT_SIZE_MIN = 0; - Integer SUB_COMMENT_SIZE_MAX = 160; - - String PROJECT_DECLARE = "项目申报"; - String UNIT_INNER_AUDIT = "单位内部审核"; - String PRELIMINARY_PREVIEW = "项目预审"; - - String DEPT_UNITED_REVIEW = "部门联审"; - String PROVINCE_UNITED_REVIEW = "省级部门联审"; - String ANNUAL_PLAN = "年度计划"; - String CONSTRUCTION_PLAN_REVIEW = "建设方案评审"; - String PROJECT_APPROVAL = "立项批复"; - String TENDER_PURCHASE = "招标采购"; - String PROJECT_PRELIMINARY_INSPECTION = "项目初验"; - String PROJECT_FINAL_INSPECTION = "项目终验"; - - String ARCHIVED = "归档"; - - String FILE_NAME = "name"; - String BASIS_FILE_NAME = "fileName"; - - String NULL = "null"; - - String TITLE = "title"; - - String FILE_NAME_STR = "fileName"; - String FILE_ID_STR = "fileId"; - String ID_STR = "id"; - String FILE_LIST = "fileList"; - String ITEM_BASED = "依据项:"; - String ITEM_BASED_FILE_NAME = "依据文件名:"; - String APPENDIX = "文件:"; - String NEW_CONSTRUCTION = "新建"; - String CONTINUED_CONSTRUCTION = "续建"; - String MONTH = "月"; - String ZHI = "至"; - String YEAR = "年"; - - Integer VERSION_ONE = 1; - Integer VERSION_SIZE = 2; - Integer VERSION_JUDGE = -1; - - String COPY = "副本"; - String PROJECT_REPEAT = " 项目已在其他评价计划中，请勿重复添加!"; - String APP_REPEAT = " 应用已在其他评价计划中，请勿重复添加!"; - Integer REAPPRAISAL_TYPE = 1; - Integer VERIFY_TYPE = 2; - String REPEAT = " 已在其他当前评价计划其他分组中，请勿重复添加!"; - - String NORMAL_TIME_PATTERN = "yyyy-MM-dd"; - -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DefValConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DefValConst.java deleted file mode 100644 index 2a6b6a5..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DefValConst.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hz.pm.api.common.constant; - - -import com.ningdatech.basic.util.StrPool; - -/** - * 默认值 - * - * @author PoffyZhang - */ -public interface DefValConst { - - /** - * 默认的根节点path - */ - String ROOT_PATH = StrPool.COMMA; - /** - * 默认树层级 - */ - Integer TREE_GRADE = 0; - /** - * 默认的父id - */ - Long PARENT_ID = 0L; - /** - * 默认的排序 - */ - Integer SORT_VALUE = 0; - /** - * 字典占位符 - */ - String DICT_PLACEHOLDER = "###"; - -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DingConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DingConst.java deleted file mode 100644 index 33b0959..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DingConst.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hz.pm.api.common.constant; - -/** - * 浙政钉常量 - * - * @author CMM - * @since 2023/02/01 14:49 - */ -public interface DingConst { - /** - * 工作通知 - */ - String WORKING_NOTICE = "/message/workNotification"; -} \ No newline at end of file diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/ProjectDeclareConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/ProjectDeclareConst.java deleted file mode 100644 index 031d68e..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/ProjectDeclareConst.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.hz.pm.api.common.constant; - -import java.math.BigDecimal; - -/** - * 项目申报表单数据常量key - * @return - * @author CMM - * @since 2023/01/19 10:31 - */ -public interface ProjectDeclareConst { - - /** - * 基本信息 - */ - class BasicInformation { - // 项目名称 - public static final String PROJECT_NAME = "projectName"; - // 是否一地创新全省共享项目 - public static final String INNOVATION_SHARING_PROJECT = "innovationSharingProject"; - // 是否临时增补 - public static final String TEMPORARY_SUPPLEMENT = "temporarySupplement"; - // 项目负责人 - public static final String PROJECT_LEADER = "projectLeader"; - // 项目负责人手机号 - public static final String PROJECT_LEADER_PHONE_NUMBER = "projectLeaderPhoneNumber"; - // 项目联系人 - public static final String PROJECT_CONTACT = "projectContact"; - // 项目联系人手机号 - public static final String PROJECT_CONTACT_PHONE_NUMBER = "projectContactPhoneNumber"; - // 建设单位 - public static final String CONSTRUCTION_UNIT = "constructionUnit"; - // 建设单位统一信用代码 - public static final String CONSTRUCTION_UNIT_UNIFIED_CREDIT_CODE = "constructionUnitUnifiedCreditCode"; - // 项目类型 - public static final String PROJECT_TYPE = "projectType"; - // 是否首次新建 - public static final String FIRST_NEW_CONSTRUCTION = "firstNewConstruction"; - // 预算年度 - public static final String BUDGET_YEAR = "projectYear"; - // 建设开始时间 - public static final String CONSTRUCTION_START_TIME = "constructionStartTime"; - // 建设结束时间 - public static final String CONSTRUCTION_END_TIME = "constructionEndTime"; - // 四大体系 - public static final String FOUR_SYSTEM = "fourSystem"; - // 是否数字化改革项目 - public static final String DIGITAL_REFORM_PROJECT = "digitalReformProject"; - // 建设层级 - public static final String CONSTRUCTION_HIERARCHY = "constructionHierarchy"; - // 立项依据材料 - public static final String PROJECT_BASIS_MATERIAL = "projectBasisMaterial"; - // 发改编码 - public static final String CHANGE_CODE = "changeCode"; - // 财政编码 - public static final String FISCAL_CODE = "fiscalCode"; - // 是否上云 - public static final String ON_CLOUD = "onCloud"; - // 项目简介 - public static final String PROJECT_INTRODUCTION = "projectIntroduction"; - } - - /** - * 资金申报情况 - */ - class FundDeclareInfo { - // 申报金额 - public static final String DECLARE_AMOUNT = "declareAmount"; - // 自有资金 - public static final String OWN_FUND = "ownFund"; - // 政府投资-本级财政资金 - public static final String GOVERNMENT_INVESTMENT_SAME_LEVEL_FUND = "governmentInvestmentSameLevelFund"; - // 政府投资-上级补助资金 - public static final String GOVERNMENT_INVESTMENT_SUPERIOR_FUND = "governmentInvestmentSuperiorFund"; - // 银行贷款 - public static final String BANK_LOAN = "bankLoan"; - // 其他资金 - public static final String OTHER_FUND = "otherFund"; - } - - /** - * 总投资分配情况 - */ - class TotalInvestmentAllocations { - // 软件开发 - public static final String SOFTWARE_DEVELOPMENT = "softwareDevelopment"; - // 云资源、硬件配置 - public static final String CLOUD_RESOURCE_HARDWARE_CONFIGURATION = "cloudResourceHardwareConfiguration"; - // 第三方服务 - public static final String THIRD_PARTY_SERVICE = "thirdPartyService"; - } - /** - * 年度支付计划 - */ - class AnnualPaymentPlan { - // 年度支付金额 - public static final String ANNUAL_PAYMENT_AMOUNT = "annualPaymentAmount"; - // 自有资金 - public static final String OWN_FUND = "ownFund"; - // 政府投资-本级财政资金 - public static final String GOVERNMENT_INVESTMENT_SAME_LEVEL_FUND = "governmentInvestmentSameLevelFund"; - // 政府投资-上级补助资金 - public static final String GOVERNMENT_INVESTMENT_SUPERIOR_FUND = "governmentInvestmentSuperiorFund"; - // 银行贷款 - public static final String BANK_LOAN = "bankLoan"; - // 其他 - public static final String OTHER = "other"; - } - /** - * 核心业务 - */ - class CoreBusiness { - - } - /** - * 安全投入 - */ - class SafetyInput { - // 投入项 - public static final String INPUT_ITEM = "inputItem"; - // 内容描述 - public static final String CONTENT_DESCRIPTION = "contentDescription"; - // 金额 - public static final String AMOUNT = "amount"; - } - /** - * 工程形象进度 - */ - class ProjectImageProgress { - // 第一季度 - public static final String FIRST_QUARTER = "firstQuarter"; - // 第二季度 - public static final String SECOND_QUARTER = "secondQuarter"; - // 第三季度 - public static final String THIRD_QUARTER = "thirdQuarter"; - // 第四季度 - public static final String FOURTH_QUARTER = "fourthQuarter"; - } - /** - * 附件 - */ - class Appendix { - - } - /** - * 备注 - */ - class Remark { - - } - /** - * 应用信息 - */ - class ApplicationInformation { - - } - - class Number { - public static final BigDecimal DECLARE_AMOUNT_JUDGEMENT = BigDecimal.valueOf(1000); - - //区县是500万 - public static final BigDecimal DECLARE_COUNTY_AMOUNT_JUDGEMENT = BigDecimal.valueOf(500); - - public static final Integer COUNTRY_BUILD_LEVEL = 1; - public static final Integer PROVINCE_BUILD_LEVEL = 2; - public static final Integer PROVINCE_SELF_BUILD_LEVEL = 3; - public static final Integer CITY_BUILD_LEVEL = 4; - public static final Integer CITY_SELF_BUILD_LEVEL = 5; - public static final Integer DISTRICTS_COUNTRIES_BUILD_LEVEL = 6; - public static final Integer VILLAGES_TOWNS_BUILD_LEVEL = 7; - } -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/RegionConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/RegionConst.java deleted file mode 100644 index dea5ee1..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/RegionConst.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.hz.pm.api.common.constant; - -import com.google.common.collect.Lists; - -import java.util.List; - -/** - *

- * RegionConst - *

- * - * @author WendyYang - * @since 13:57 2023/3/1 - */ -public interface RegionConst { - - //---------------------------------------地区层级(缩写RL)------------------------------------------------------------- - - int RL_PROVINCE = 1; - - int RL_CITY = 2; - - int RL_COUNTY = 3; - - //---------------------------------------地区编码(缩写RC)------------------------------------------------------------- - - /** - * 丽水行政区划编码 - */ - String RC_LS = "331100"; - //丽水开发区 - String LS_KF = "331118"; - String LS_KF_IRS = "331151"; - String RC_LS_SBJ_IRS = "331101"; - //遂昌县 - String RC_SC = "331123"; - String LS_KF_NAME = "开发区"; - - /** - * 中国行政区划编码 - */ - String RC_CHINA = "100000"; - - - /** - * 浙江行政区划编码 - */ - String RC_ZJ = "330000"; - - String NINE_CODE_LAST = "000"; - //莲都 - String LD = "331102"; - //青田 - String QT = "331121"; - //缙云 - String JY = "331122"; - //遂昌 - String SC = "331123"; - //松阳 - String SY = "331124"; - //云和 - String YH = "331125"; - //庆元 - String QY = "331126"; - String QN = "331127"; - String LQ = "331181"; - - List LS_ARR = Lists.newArrayList(RC_LS, LS_KF, LD, QT, JY, SC, SY, YH, QY, QN, LQ); - - //----------------------------------------地区父级ID(缩写PID)--------------------------------------------------------- - - long PID_CHINA = 0; - -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/StateMachineConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/StateMachineConst.java deleted file mode 100644 index f7acc26..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/constant/StateMachineConst.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.hz.pm.api.common.constant; - -/** - * @author CMM - * @since 2023/02/07 16:24 - */ - -public class StateMachineConst { - - public static final String PROJECT_DECLARE = "projectDeclare"; - public static final String APPLICATION_DECLARE = "applicationDeclare"; - public static final String LI_SHUI_CITY_AREA_CODE = "331100"; - -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BaseFieldFillHandler.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BaseFieldFillHandler.java index e550ddd..7b2513f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BaseFieldFillHandler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/BaseFieldFillHandler.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; import java.time.LocalDateTime; -import static com.hz.pm.api.common.constant.BaseFieldConst.*; +import static com.hz.pm.api.common.model.constant.BaseFieldConst.*; /** *

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/basic/AbstractRegionLimitHelper.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/basic/AbstractRegionLimitHelper.java index 56903b7..3562c5e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/basic/AbstractRegionLimitHelper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/basic/AbstractRegionLimitHelper.java @@ -2,15 +2,11 @@ package com.hz.pm.api.common.helper.basic; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.common.helper.RegionLimitHelper; -import com.hz.pm.api.expert.entity.ExpertUserFullInfo; import com.hz.pm.api.expert.service.IExpertUserFullInfoService; -import com.hz.pm.api.meta.model.ExpertRegionInfo; import com.hz.pm.api.sys.service.IRegionService; import com.hz.pm.api.user.service.IUserInfoService; import lombok.AllArgsConstructor; -import java.util.Objects; - /** *

* AbstractRegionLimitHelper @@ -27,22 +23,4 @@ public abstract class AbstractRegionLimitHelper implements RegionLimitHelper { protected final IUserInfoService iUserInfoService; protected final IRegionService regionService; - - /** - * 根据 专家用户id 获取专家层级 - * - * @param expertUserId / - * @return / - */ - protected ExpertRegionInfo getExpertRegionInfo(Long expertUserId) { - ExpertUserFullInfo userFullInfo = expertUserFullInfoService.getByUserId(expertUserId); - if (Objects.isNull(userFullInfo)) { - return new ExpertRegionInfo(); - } - ExpertRegionInfo regionInfo = new ExpertRegionInfo(); - regionInfo.setRegionCode(userFullInfo.getRegionCode()); - regionInfo.setRegionLevel(userFullInfo.getRegionLevel()); - return regionInfo; - } - } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/RegionsCacheHelperImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/RegionsCacheHelperImpl.java index 16c775e..789f84a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/RegionsCacheHelperImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/RegionsCacheHelperImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.text.StrPool; import com.hz.pm.api.sys.service.IRegionService; import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.util.CollUtils; -import com.hz.pm.api.common.constant.RegionConst; +import com.hz.pm.api.common.model.constant.RegionConst; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.common.helper.basic.AbstractRegionCacheHelper; import com.hz.pm.api.common.model.RegionMapKey; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/UserInfoHelperImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/UserInfoHelperImpl.java index 628bd8e..edd8963 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/UserInfoHelperImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/impl/UserInfoHelperImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.organization.model.entity.DingEmployeeInfo; import com.hz.pm.api.organization.model.entity.DingOrganization; @@ -15,9 +15,9 @@ import com.hz.pm.api.sys.mapper.RoleMapper; import com.hz.pm.api.sys.model.entity.Role; import com.hz.pm.api.sys.model.entity.UserRole; import com.hz.pm.api.sys.service.IUserRoleService; -import com.hz.pm.api.user.constant.UserAvailableEnum; +import com.hz.pm.api.user.model.enumeration.UserAvailableEnum; import com.hz.pm.api.user.entity.UserInfo; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.service.IUserInfoService; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java new file mode 100644 index 0000000..2b7d4bf --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java @@ -0,0 +1,21 @@ +package com.hz.pm.api.common.model.constant; + +/** + *

+ * 创建人修改人基础字段 + *

+ * + * @author WendyYang + * @since 17:17 2023/01/29 + */ +public class BaseFieldConst { + + private BaseFieldConst() { + } + + public static final String CREATE_BY = "createBy"; + public static final String UPDATE_BY = "updateBy"; + public static final String CREATE_ON = "createOn"; + public static final String UPDATE_ON = "updateOn"; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BizConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BizConst.java new file mode 100644 index 0000000..5f90688 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BizConst.java @@ -0,0 +1,113 @@ +package com.hz.pm.api.common.model.constant; + +import com.ningdatech.basic.model.ApiResponse; + +import java.math.BigDecimal; + +/** + *

+ * 业务常量 + *

+ * + * @author WendyYang + * @since 13:42 2022/12/1 + */ +public class BizConst { + + private BizConst() { + } + + /** + * SQL查询一条 + */ + public static final String LIMIT_1 = "limit 1"; + + public static final String COOKIE_KEY = "HZPM_SESSION"; + + /** + * 一小时秒数 + **/ + public static final BigDecimal SECONDS_BY_HOUR = new BigDecimal(60 * 60); + + /** + * 十分钟的毫秒数 + */ + public static final long MILLS_10_MIN = 1000L * 60 * 10; + + /** + * 中国行政区划编码 + */ + public static final long ROOT_REGION_CODE = 100000L; + + public static final double D100 = 100.0; + + /** + * 一级行政区划数量 + */ + public static final int NUM_PROVINCE = 34; + + /** + * 默认的父id + */ + public static final long PARENT_ID = 0L; + + /** + * 默认树层级 + */ + public static final int TREE_GRADE = 0; + + /** + * 默认的排序 + */ + public static final int SORT_VALUE = 0; + + /** + * 浙江省的region_id + */ + public static final long ZJ_REGION_CODE = 330000L; + public static final String NINE_AREA_CODE_LAST = "000"; + + /** + * 省/直辖市 level + */ + public static final int GOV_L1 = 1; + + /** + * 市 level + */ + public static final int GOV_L2 = 2; + + /** + * 区/县 level + */ + public static final int GOV_L3 = 3; + + /** + * 密码正则：长度8-20位且至少包含大写字母、小写字母、数字或特殊符号中的任意三种 + */ + public static final String REGEX_PASS = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_]+$)(?![a-z0-9]+$)(?![a-z\\W_]+$)(?![0-9\\W_]+$)[a-zA-Z0-9\\W_]{8,20}$"; + + public static final ApiResponse UNAUTHENTICATED = ApiResponse.of(401, "用户未登录", null); + + public static final int MAX_EXPORT_COUNT = 5000; + + public static final String RESPONSE_KEY_DATA = "data"; + public static final String RESPONSE_KEY_ID = "id"; + public static final String RESPONSE_KEY_DING_CODE = "dingCode"; + public static final String RESPONSE_KEY_MATTER_NAME = "matterName"; + public static final String RESPONSE_KEY_ORG_NAME = "orgName"; + public static final String RESPONSE_KEY_USER_STATE = "userState"; + + public static final String RESPONSE_KEY_AREA_NAME = "areaName"; + public static final String ORG_NAME = "organizationName"; + public static final String ORG_CODE = "organizationCode"; + + public static final String DEV = "dev"; + public static final String PRE = "pre"; + public static final String PROD = "prod"; + + public static final String SAVE_SUCCESS = "保存成功"; + public static final String OP_SUCCESS = "操作成功"; + public static final String OP_FAIL = "操作失败"; + public static final String SAVE_FAIL = "保存失败"; +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BooleanBit.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BooleanBit.java new file mode 100644 index 0000000..57e1fc2 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BooleanBit.java @@ -0,0 +1,17 @@ +package com.hz.pm.api.common.model.constant; + +/** + *

+ * BooleanBit + *

+ * + * @author WendyYang + * @since 16:12 2023/12/15 + */ +public interface BooleanBit { + + int TRUE = 1; + + int FALSE = 0; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/CommonConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/CommonConst.java new file mode 100644 index 0000000..47d4131 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/CommonConst.java @@ -0,0 +1,69 @@ +package com.hz.pm.api.common.model.constant; + +/** + * @description: 常量 + * @author: LiuXinXin + * @date: 2022/5/5 17:31 + */ +public interface CommonConst { + + String COOKIE_KEY = "HZPM_JSESSION"; + + Integer EXPORT_PAGE_NUMBER = 1; + Integer EXPORT_PAGE_SIZE = 100000; + String CALL_STATUS = "status"; + String CALL_STATUS_OK_VALUE = "ok"; + + Integer COMMENT_MAX_SIZE = 163; + Integer SUB_COMMENT_SIZE_MIN = 0; + Integer SUB_COMMENT_SIZE_MAX = 160; + + String PROJECT_DECLARE = "项目申报"; + String UNIT_INNER_AUDIT = "单位内部审核"; + String PRELIMINARY_PREVIEW = "项目预审"; + + String DEPT_UNITED_REVIEW = "部门联审"; + String PROVINCE_UNITED_REVIEW = "省级部门联审"; + String ANNUAL_PLAN = "年度计划"; + String CONSTRUCTION_PLAN_REVIEW = "建设方案评审"; + String PROJECT_APPROVAL = "立项批复"; + String TENDER_PURCHASE = "招标采购"; + String PROJECT_PRELIMINARY_INSPECTION = "项目初验"; + String PROJECT_FINAL_INSPECTION = "项目终验"; + + String ARCHIVED = "归档"; + + String FILE_NAME = "name"; + String BASIS_FILE_NAME = "fileName"; + + String NULL = "null"; + + String TITLE = "title"; + + String FILE_NAME_STR = "fileName"; + String FILE_ID_STR = "fileId"; + String ID_STR = "id"; + String FILE_LIST = "fileList"; + String ITEM_BASED = "依据项:"; + String ITEM_BASED_FILE_NAME = "依据文件名:"; + String APPENDIX = "文件:"; + String NEW_CONSTRUCTION = "新建"; + String CONTINUED_CONSTRUCTION = "续建"; + String MONTH = "月"; + String ZHI = "至"; + String YEAR = "年"; + + Integer VERSION_ONE = 1; + Integer VERSION_SIZE = 2; + Integer VERSION_JUDGE = -1; + + String COPY = "副本"; + String PROJECT_REPEAT = " 项目已在其他评价计划中，请勿重复添加!"; + String APP_REPEAT = " 应用已在其他评价计划中，请勿重复添加!"; + Integer REAPPRAISAL_TYPE = 1; + Integer VERIFY_TYPE = 2; + String REPEAT = " 已在其他当前评价计划其他分组中，请勿重复添加!"; + + String NORMAL_TIME_PATTERN = "yyyy-MM-dd"; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DefValConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DefValConst.java new file mode 100644 index 0000000..fe21b98 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DefValConst.java @@ -0,0 +1,34 @@ +package com.hz.pm.api.common.model.constant; + + +import com.ningdatech.basic.util.StrPool; + +/** + * 默认值 + * + * @author PoffyZhang + */ +public interface DefValConst { + + /** + * 默认的根节点path + */ + String ROOT_PATH = StrPool.COMMA; + /** + * 默认树层级 + */ + Integer TREE_GRADE = 0; + /** + * 默认的父id + */ + Long PARENT_ID = 0L; + /** + * 默认的排序 + */ + Integer SORT_VALUE = 0; + /** + * 字典占位符 + */ + String DICT_PLACEHOLDER = "###"; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DingConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DingConst.java new file mode 100644 index 0000000..17c4eaa --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DingConst.java @@ -0,0 +1,14 @@ +package com.hz.pm.api.common.model.constant; + +/** + * 浙政钉常量 + * + * @author CMM + * @since 2023/02/01 14:49 + */ +public interface DingConst { + /** + * 工作通知 + */ + String WORKING_NOTICE = "/message/workNotification"; +} \ No newline at end of file diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ProjectDeclareConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ProjectDeclareConst.java new file mode 100644 index 0000000..87e9e93 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ProjectDeclareConst.java @@ -0,0 +1,172 @@ +package com.hz.pm.api.common.model.constant; + +import java.math.BigDecimal; + +/** + * 项目申报表单数据常量key + * @return + * @author CMM + * @since 2023/01/19 10:31 + */ +public interface ProjectDeclareConst { + + /** + * 基本信息 + */ + class BasicInformation { + // 项目名称 + public static final String PROJECT_NAME = "projectName"; + // 是否一地创新全省共享项目 + public static final String INNOVATION_SHARING_PROJECT = "innovationSharingProject"; + // 是否临时增补 + public static final String TEMPORARY_SUPPLEMENT = "temporarySupplement"; + // 项目负责人 + public static final String PROJECT_LEADER = "projectLeader"; + // 项目负责人手机号 + public static final String PROJECT_LEADER_PHONE_NUMBER = "projectLeaderPhoneNumber"; + // 项目联系人 + public static final String PROJECT_CONTACT = "projectContact"; + // 项目联系人手机号 + public static final String PROJECT_CONTACT_PHONE_NUMBER = "projectContactPhoneNumber"; + // 建设单位 + public static final String CONSTRUCTION_UNIT = "constructionUnit"; + // 建设单位统一信用代码 + public static final String CONSTRUCTION_UNIT_UNIFIED_CREDIT_CODE = "constructionUnitUnifiedCreditCode"; + // 项目类型 + public static final String PROJECT_TYPE = "projectType"; + // 是否首次新建 + public static final String FIRST_NEW_CONSTRUCTION = "firstNewConstruction"; + // 预算年度 + public static final String BUDGET_YEAR = "projectYear"; + // 建设开始时间 + public static final String CONSTRUCTION_START_TIME = "constructionStartTime"; + // 建设结束时间 + public static final String CONSTRUCTION_END_TIME = "constructionEndTime"; + // 四大体系 + public static final String FOUR_SYSTEM = "fourSystem"; + // 是否数字化改革项目 + public static final String DIGITAL_REFORM_PROJECT = "digitalReformProject"; + // 建设层级 + public static final String CONSTRUCTION_HIERARCHY = "constructionHierarchy"; + // 立项依据材料 + public static final String PROJECT_BASIS_MATERIAL = "projectBasisMaterial"; + // 发改编码 + public static final String CHANGE_CODE = "changeCode"; + // 财政编码 + public static final String FISCAL_CODE = "fiscalCode"; + // 是否上云 + public static final String ON_CLOUD = "onCloud"; + // 项目简介 + public static final String PROJECT_INTRODUCTION = "projectIntroduction"; + } + + /** + * 资金申报情况 + */ + class FundDeclareInfo { + // 申报金额 + public static final String DECLARE_AMOUNT = "declareAmount"; + // 自有资金 + public static final String OWN_FUND = "ownFund"; + // 政府投资-本级财政资金 + public static final String GOVERNMENT_INVESTMENT_SAME_LEVEL_FUND = "governmentInvestmentSameLevelFund"; + // 政府投资-上级补助资金 + public static final String GOVERNMENT_INVESTMENT_SUPERIOR_FUND = "governmentInvestmentSuperiorFund"; + // 银行贷款 + public static final String BANK_LOAN = "bankLoan"; + // 其他资金 + public static final String OTHER_FUND = "otherFund"; + } + + /** + * 总投资分配情况 + */ + class TotalInvestmentAllocations { + // 软件开发 + public static final String SOFTWARE_DEVELOPMENT = "softwareDevelopment"; + // 云资源、硬件配置 + public static final String CLOUD_RESOURCE_HARDWARE_CONFIGURATION = "cloudResourceHardwareConfiguration"; + // 第三方服务 + public static final String THIRD_PARTY_SERVICE = "thirdPartyService"; + } + /** + * 年度支付计划 + */ + class AnnualPaymentPlan { + // 年度支付金额 + public static final String ANNUAL_PAYMENT_AMOUNT = "annualPaymentAmount"; + // 自有资金 + public static final String OWN_FUND = "ownFund"; + // 政府投资-本级财政资金 + public static final String GOVERNMENT_INVESTMENT_SAME_LEVEL_FUND = "governmentInvestmentSameLevelFund"; + // 政府投资-上级补助资金 + public static final String GOVERNMENT_INVESTMENT_SUPERIOR_FUND = "governmentInvestmentSuperiorFund"; + // 银行贷款 + public static final String BANK_LOAN = "bankLoan"; + // 其他 + public static final String OTHER = "other"; + } + /** + * 核心业务 + */ + class CoreBusiness { + + } + /** + * 安全投入 + */ + class SafetyInput { + // 投入项 + public static final String INPUT_ITEM = "inputItem"; + // 内容描述 + public static final String CONTENT_DESCRIPTION = "contentDescription"; + // 金额 + public static final String AMOUNT = "amount"; + } + /** + * 工程形象进度 + */ + class ProjectImageProgress { + // 第一季度 + public static final String FIRST_QUARTER = "firstQuarter"; + // 第二季度 + public static final String SECOND_QUARTER = "secondQuarter"; + // 第三季度 + public static final String THIRD_QUARTER = "thirdQuarter"; + // 第四季度 + public static final String FOURTH_QUARTER = "fourthQuarter"; + } + /** + * 附件 + */ + class Appendix { + + } + /** + * 备注 + */ + class Remark { + + } + /** + * 应用信息 + */ + class ApplicationInformation { + + } + + class Number { + public static final BigDecimal DECLARE_AMOUNT_JUDGEMENT = BigDecimal.valueOf(1000); + + //区县是500万 + public static final BigDecimal DECLARE_COUNTY_AMOUNT_JUDGEMENT = BigDecimal.valueOf(500); + + public static final Integer COUNTRY_BUILD_LEVEL = 1; + public static final Integer PROVINCE_BUILD_LEVEL = 2; + public static final Integer PROVINCE_SELF_BUILD_LEVEL = 3; + public static final Integer CITY_BUILD_LEVEL = 4; + public static final Integer CITY_SELF_BUILD_LEVEL = 5; + public static final Integer DISTRICTS_COUNTRIES_BUILD_LEVEL = 6; + public static final Integer VILLAGES_TOWNS_BUILD_LEVEL = 7; + } +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java new file mode 100644 index 0000000..31214c1 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java @@ -0,0 +1,74 @@ +package com.hz.pm.api.common.model.constant; + +import com.google.common.collect.Lists; + +import java.util.List; + +/** + *

+ * RegionConst + *

+ * + * @author WendyYang + * @since 13:57 2023/3/1 + */ +public interface RegionConst { + + //---------------------------------------地区层级(缩写RL)------------------------------------------------------------- + + int RL_PROVINCE = 1; + + int RL_CITY = 2; + + int RL_COUNTY = 3; + + //---------------------------------------地区编码(缩写RC)------------------------------------------------------------- + + /** + * 丽水行政区划编码 + */ + String RC_LS = "331100"; + //丽水开发区 + String LS_KF = "331118"; + String LS_KF_IRS = "331151"; + String RC_LS_SBJ_IRS = "331101"; + //遂昌县 + String RC_SC = "331123"; + String LS_KF_NAME = "开发区"; + + /** + * 中国行政区划编码 + */ + String RC_CHINA = "100000"; + + + /** + * 浙江行政区划编码 + */ + String RC_ZJ = "330000"; + + String NINE_CODE_LAST = "000"; + //莲都 + String LD = "331102"; + //青田 + String QT = "331121"; + //缙云 + String JY = "331122"; + //遂昌 + String SC = "331123"; + //松阳 + String SY = "331124"; + //云和 + String YH = "331125"; + //庆元 + String QY = "331126"; + String QN = "331127"; + String LQ = "331181"; + + List LS_ARR = Lists.newArrayList(RC_LS, LS_KF, LD, QT, JY, SC, SY, YH, QY, QN, LQ); + + //----------------------------------------地区父级ID(缩写PID)--------------------------------------------------------- + + long PID_CHINA = 0; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/StateMachineConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/StateMachineConst.java new file mode 100644 index 0000000..c9ce670 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/StateMachineConst.java @@ -0,0 +1,14 @@ +package com.hz.pm.api.common.model.constant; + +/** + * @author CMM + * @since 2023/02/07 16:24 + */ + +public class StateMachineConst { + + public static final String PROJECT_DECLARE = "projectDeclare"; + public static final String APPLICATION_DECLARE = "applicationDeclare"; + public static final String LI_SHUI_CITY_AREA_CODE = "331100"; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareAction.java index a933c13..68eeb56 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareChoiceAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareChoiceAction.java index e552782..254a69f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareChoiceAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareChoiceAction.java @@ -1,12 +1,12 @@ package com.hz.pm.api.common.statemachine.action; import cn.hutool.core.collection.CollUtil; -import com.hz.pm.api.common.constant.ProjectDeclareConst; -import com.hz.pm.api.common.constant.StateMachineConst; +import com.hz.pm.api.common.model.constant.ProjectDeclareConst; +import com.hz.pm.api.common.model.constant.StateMachineConst; import com.hz.pm.api.common.enumeration.CommonEnum; import com.hz.pm.api.common.statemachine.util.StateMachineUtils; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import com.hz.pm.api.projectlib.model.entity.ProjectApplication; import lombok.extern.slf4j.Slf4j; @@ -15,7 +15,7 @@ import org.springframework.statemachine.action.Action; import java.util.List; -import static com.hz.pm.api.common.constant.StateMachineConst.APPLICATION_DECLARE; +import static com.hz.pm.api.common.model.constant.StateMachineConst.APPLICATION_DECLARE; /** * 项目申报状态机选择分支action类 diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJNAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJNAction.java index 51a8dac..6a63e55 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJNAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJNAction.java @@ -1,10 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.builder.ProjectDeclareStateMachineBuilder; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJYAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJYAction.java index 80ceaa4..a0c4521 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJYAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareJYAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareKFBAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareKFBAction.java index 700c654..9189f14 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareKFBAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareKFBAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLDAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLDAction.java index 893144a..7b7c50c 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLDAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLDAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLQAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLQAction.java index 653f6c6..f664b7b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLQAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareLQAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQTAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQTAction.java index ea404f1..aaaea23 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQTAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQTAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQYAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQYAction.java index 9041fd1..54fcb7d 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQYAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareQYAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSBJAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSBJAction.java index 46265ce..adc1d69 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSBJAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSBJAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSCAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSCAction.java index 2d8c554..4e311d1 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSCAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSCAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSYAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSYAction.java index 70572f2..9b262b3 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSYAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareSYAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareYHAction.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareYHAction.java index 9bf7f07..4960ffa 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareYHAction.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectDeclareYHAction.java @@ -1,9 +1,9 @@ package com.hz.pm.api.common.statemachine.action; -import com.hz.pm.api.common.constant.StateMachineConst; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.model.constant.StateMachineConst; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.extern.slf4j.Slf4j; import org.springframework.messaging.Message; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java index 4f1e268..78abf56 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java @@ -1,7 +1,7 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import org.springframework.beans.factory.BeanFactory; import org.springframework.statemachine.StateMachine; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java index 1abb32b..0ba5909 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java index b1e0b2b..7ceb5ca 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java index 94fa453..8d983e4 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java index a4fe433..55afce7 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java index c8604df..5e871ff 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java index bbd5fb5..d50ee0d 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java index 932f5bc..be23bd9 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java index 949b596..75e600a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java index ff29abb..174e05e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java index 474e47b..201adc5 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java index 6170a0a..343d56d 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java @@ -1,10 +1,10 @@ package com.hz.pm.api.common.statemachine.builder; import com.hz.pm.api.common.statemachine.action.ProjectDeclareChoiceAction; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; import com.hz.pm.api.common.statemachine.factory.ProjectDeclareGuardFactory; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java new file mode 100644 index 0000000..b436de1 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java @@ -0,0 +1,34 @@ +package com.hz.pm.api.common.statemachine.contant; + +/** + * @Classname RegionContant + * @Description + * @Date 2023/6/13 13:57 + * @Author PoffyZhang + */ +public class RegionContant { + //市本级 + public static final String LS_SBJ_CODE = "331100"; + //莲都区 + public static final String LS_LD_CODE = "331102"; + //青田县 + public static final String LS_QT_CODE = "331121"; + //缙云县 + public static final String LS_JY_CODE = "331122"; + //遂昌县 + public static final String LS_SC_CODE = "331123"; + //松阳县 + public static final String LS_SY_CODE = "331124"; + //云和县 + public static final String LS_YH_CODE = "331125"; + //庆元县 + public static final String LS_QY_CODE = "331126"; + //景宁畲族自治县 + public static final String LS_JN_CODE = "331127"; + //龙泉市 + public static final String LS_LQ_CODE = "331181"; + //开发区 + public static final String LS_KFQ_CODE = "331199"; + + public static final String MORE_CODE = "000"; +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contants/RegionContant.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contants/RegionContant.java deleted file mode 100644 index 6614aa5..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contants/RegionContant.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hz.pm.api.common.statemachine.contants; - -/** - * @Classname RegionContant - * @Description - * @Date 2023/6/13 13:57 - * @Author PoffyZhang - */ -public class RegionContant { - //市本级 - public static final String LS_SBJ_CODE = "331100"; - //莲都区 - public static final String LS_LD_CODE = "331102"; - //青田县 - public static final String LS_QT_CODE = "331121"; - //缙云县 - public static final String LS_JY_CODE = "331122"; - //遂昌县 - public static final String LS_SC_CODE = "331123"; - //松阳县 - public static final String LS_SY_CODE = "331124"; - //云和县 - public static final String LS_YH_CODE = "331125"; - //庆元县 - public static final String LS_QY_CODE = "331126"; - //景宁畲族自治县 - public static final String LS_JN_CODE = "331127"; - //龙泉市 - public static final String LS_LQ_CODE = "331181"; - //开发区 - public static final String LS_KFQ_CODE = "331199"; - - public static final String MORE_CODE = "000"; -} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/ProjectStatusChangeEvent.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/ProjectStatusChangeEvent.java index 45db507..6a9499c 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/ProjectStatusChangeEvent.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/ProjectStatusChangeEvent.java @@ -1,6 +1,6 @@ package com.hz.pm.api.common.statemachine.event; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/factory/ProjectDeclareGuardFactory.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/factory/ProjectDeclareGuardFactory.java index 7a8521b..0de73d1 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/factory/ProjectDeclareGuardFactory.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/factory/ProjectDeclareGuardFactory.java @@ -1,12 +1,12 @@ package com.hz.pm.api.common.statemachine.factory; import cn.hutool.core.collection.CollUtil; -import com.hz.pm.api.common.constant.ProjectDeclareConst; -import com.hz.pm.api.common.constant.StateMachineConst; +import com.hz.pm.api.common.model.constant.ProjectDeclareConst; +import com.hz.pm.api.common.model.constant.StateMachineConst; import com.hz.pm.api.common.enumeration.CommonEnum; import com.hz.pm.api.common.statemachine.util.StateMachineUtils; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import com.hz.pm.api.projectlib.model.entity.ProjectApplication; import org.springframework.statemachine.StateContext; @@ -14,7 +14,7 @@ import org.springframework.statemachine.guard.Guard; import java.util.List; -import static com.hz.pm.api.common.constant.StateMachineConst.APPLICATION_DECLARE; +import static com.hz.pm.api.common.model.constant.StateMachineConst.APPLICATION_DECLARE; /** * 项目申报状态机guard集合类 diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/MachineBuilderFounder.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/MachineBuilderFounder.java index 1f07d16..42aef82 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/MachineBuilderFounder.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/MachineBuilderFounder.java @@ -2,7 +2,7 @@ package com.hz.pm.api.common.statemachine.util; import com.google.common.collect.Maps; import com.hz.pm.api.common.statemachine.builder.*; -import com.hz.pm.api.common.statemachine.contants.RegionContant; +import com.hz.pm.api.common.statemachine.contant.RegionContant; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/StateMachineUtils.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/StateMachineUtils.java index 06dffc2..5e3ecee 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/StateMachineUtils.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/util/StateMachineUtils.java @@ -2,14 +2,11 @@ package com.hz.pm.api.common.statemachine.util; import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.function.VUtils; -import com.hz.pm.api.common.constant.ProjectDeclareConst; -import com.hz.pm.api.common.constant.RegionConst; -import com.hz.pm.api.common.constant.StateMachineConst; +import com.hz.pm.api.common.model.constant.RegionConst; +import com.hz.pm.api.common.model.constant.StateMachineConst; import com.hz.pm.api.common.statemachine.builder.ProjectDeclareStateMachineBuilder; -import com.hz.pm.api.common.statemachine.contants.RegionContant; import com.hz.pm.api.common.statemachine.event.ProjectStatusChangeEvent; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; -import com.hz.pm.api.projectlib.model.entity.ProjectApplication; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.ProjectStatusChange; import com.hz.pm.api.projectlib.model.entity.Project; import com.hz.pm.api.projectlib.service.INdProjectStatusChangeService; @@ -23,7 +20,6 @@ import org.springframework.statemachine.StateMachine; import org.springframework.statemachine.persist.StateMachinePersister; import org.springframework.stereotype.Component; -import javax.annotation.Resource; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.Objects; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/BizUtils.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/BizUtils.java index 04e9759..ed70185 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/BizUtils.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/BizUtils.java @@ -3,7 +3,7 @@ package com.hz.pm.api.common.util; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.hz.pm.api.projectlib.enumeration.ProjectTypeNewEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectTypeNewEnum; import com.ningdatech.basic.util.StrPool; import com.ningdatech.file.entity.vo.result.FileResultVO; import org.apache.commons.lang3.StringUtils; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExcelDownUtil.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExcelDownUtil.java index c7eb28d..5e893fb 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExcelDownUtil.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExcelDownUtil.java @@ -13,7 +13,7 @@ import com.ningdatech.basic.model.ApiResponse; import com.ningdatech.basic.util.CollUtils; import com.ningdatech.basic.util.NdDateUtils; import com.ningdatech.basic.util.StrPool; -import com.hz.pm.api.common.constant.CommonConst; +import com.hz.pm.api.common.model.constant.CommonConst; import com.hz.pm.api.common.enumeration.ExportOptionEnum; import com.hz.pm.api.common.model.entity.ExcelExportWriter; import com.hz.pm.api.projectlib.model.entity.Project; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/controller/DashboardController.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/controller/DashboardController.java index fd14d84..67f5b43 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/controller/DashboardController.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/controller/DashboardController.java @@ -2,7 +2,6 @@ package com.hz.pm.api.dashboard.controller; import com.ningdatech.log.annotation.WebLog; import com.hz.pm.api.dashboard.manage.CockpitStatsManage; -import com.hz.pm.api.dashboard.manage.DashboardExpertManage; import com.hz.pm.api.dashboard.manage.DashboardProjectManage; import com.hz.pm.api.dashboard.model.dto.CockpitStatsSaveDTO; import com.hz.pm.api.dashboard.model.po.QueryYearPO; @@ -29,20 +28,12 @@ import java.util.List; @Api(value = "DashboardController", tags = "驾驶舱相关接口") public class DashboardController { - private final DashboardExpertManage dashboardExpertManage; private final DashboardProjectManage dashboardProjectManage; private final CockpitStatsManage cockpitStatsManage; private final CockpitStatsStatisticsTask cockpitStatsStatisticsTask; - @PostMapping("/expert-summary") - @ApiOperation("专家驾驶舱统计数据") - @WebLog("专家驾驶舱统计数据") - public ExpertDashboardSummaryVO getExpertDashboardSummary(@Valid @RequestBody QueryYearPO queryYearPO) { - return dashboardExpertManage.getExpertDashboardSummary(queryYearPO); - } - @PostMapping("project-summary") @ApiOperation("驾驶舱项目总览") @WebLog("驾驶舱项目总览") diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/CockpitStatsHandler.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/CockpitStatsHandler.java index 7af6d90..b56c1d8 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/CockpitStatsHandler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/CockpitStatsHandler.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.hz.pm.api.common.constant.RegionConst; +import com.hz.pm.api.common.model.constant.RegionConst; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.dashboard.constant.DashboardConstant; import com.hz.pm.api.dashboard.enums.CockpitAppcationTypeEnum; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/ProjectStatusHandler.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/ProjectStatusHandler.java index 841e503..8a688a4 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/ProjectStatusHandler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/handle/ProjectStatusHandler.java @@ -2,7 +2,7 @@ package com.hz.pm.api.dashboard.handle; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.common.util.BizUtils; import com.hz.pm.api.dashboard.constant.DashboardConstant; import com.hz.pm.api.dashboard.model.vo.ProtraitProjectStatusSituationVO; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/helper/DashboardChartAssembler.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/helper/DashboardChartAssembler.java index 3194842..47b23b3 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/helper/DashboardChartAssembler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/helper/DashboardChartAssembler.java @@ -5,7 +5,7 @@ import com.hz.pm.api.dashboard.constant.ChartTypeEnum; import com.hz.pm.api.dashboard.model.basic.AnalysisChart; import com.hz.pm.api.dashboard.model.basic.AnalysisData; import com.hz.pm.api.meta.helper.DictionaryCache; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/CockpitStatsManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/CockpitStatsManage.java index 1957034..19a4a85 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/CockpitStatsManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/CockpitStatsManage.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.dashboard.constant.DashboardConstant; import com.hz.pm.api.dashboard.handle.CockpitStatsHandler; import com.hz.pm.api.dashboard.model.dto.CockpitApplicationDTO; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardExpertManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardExpertManage.java deleted file mode 100644 index 1274931..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardExpertManage.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.hz.pm.api.dashboard.manage; - -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hz.pm.api.dashboard.constant.ChartTypeEnum; -import com.hz.pm.api.dashboard.helper.DashboardChartAssembler; -import com.hz.pm.api.dashboard.helper.DashboardHelper; -import com.hz.pm.api.dashboard.model.basic.AnalysisChart; -import com.hz.pm.api.dashboard.model.basic.AnalysisData; -import com.hz.pm.api.dashboard.model.basic.StarExpertBO; -import com.hz.pm.api.dashboard.model.po.QueryYearPO; -import com.hz.pm.api.dashboard.model.vo.ExpertDashboardSummaryVO; -import com.hz.pm.api.expert.entity.ExpertUserFullInfo; -import com.hz.pm.api.expert.service.IExpertUserFullInfoService; -import com.hz.pm.api.meeting.entity.domain.Meeting; -import com.hz.pm.api.meeting.entity.domain.MeetingExpertJudge; -import com.hz.pm.api.meeting.entity.enumeration.MeetingStatusEnum; -import com.hz.pm.api.meeting.service.IMeetingExpertJudgeService; -import com.hz.pm.api.meeting.service.IMeetingService; -import com.hz.pm.api.meta.constant.ExpertDictTypeEnum; -import com.hz.pm.api.meta.model.entity.ExpertDictionary; -import com.hz.pm.api.meta.service.IExpertDictionaryService; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; - -/** - * @author liuxinxin - * @date 2023/8/2 上午10:39 - */ - -@Component -@RequiredArgsConstructor -public class DashboardExpertManage { - - private final DashboardHelper dashboardHelper; - private final IExpertUserFullInfoService iExpertUserFullInfoService; - private final IMeetingService iMeetingService; - private final IMeetingExpertJudgeService iMeetingExpertJudgeService; - private final IExpertDictionaryService iExpertDictionaryService; - private final DashboardChartAssembler dashboardChartAssembler; - - - public ExpertDashboardSummaryVO getExpertDashboardSummary(QueryYearPO req) { - String queryRegionCode = req.getRegionCode(); - List analysisChartList = new ArrayList<>(); - - // 获取丽水区域 code name Map - Map liShuiRegionCodeNameMap = dashboardHelper.getLiShuiRegionCodeNameMap(); - // 获取库内所有的专家列表 - List evidenceHasBeenSubmittedExpertInfoList = iExpertUserFullInfoService.list(); - // 专家regionCode分组map列表 - Map> regionCodeExpertMap = evidenceHasBeenSubmittedExpertInfoList.stream() - .collect(Collectors.groupingBy(ExpertUserFullInfo::getRegionCode)); - - // 各区域专家数量 - AnalysisChart regionExpertNumberChartAnalysisChart = new AnalysisChart(); - List regionExpertNumberChartDataList = new ArrayList<>(); - regionExpertNumberChartAnalysisChart.setChartType(ChartTypeEnum.REGION_EXPERT_NUMBER_CHART); - regionExpertNumberChartAnalysisChart.setDataList(regionExpertNumberChartDataList); - for (String regionCode : liShuiRegionCodeNameMap.keySet()) { - AnalysisData analysisData = new AnalysisData(); - String regionName = liShuiRegionCodeNameMap.get(regionCode); - List expertUserFullInfoList = regionCodeExpertMap.get(regionCode); - int expertCnt = 0; - if (CollectionUtil.isNotEmpty(expertUserFullInfoList)) { - expertCnt = expertUserFullInfoList.size(); - } - analysisData.setKey(regionName); - analysisData.setValue(expertCnt); - regionExpertNumberChartDataList.add(analysisData); - } - analysisChartList.add(regionExpertNumberChartAnalysisChart); - - // 查询区域的专家id 列表 - List regionDegreeExpertIdList = new ArrayList<>(); - if (StringUtils.isNotBlank(queryRegionCode)) { - List expertUserFullInfoList = regionCodeExpertMap.get(queryRegionCode); - if (CollectionUtil.isNotEmpty(expertUserFullInfoList)) { - regionDegreeExpertIdList = expertUserFullInfoList.stream() - .map(ExpertUserFullInfo::getUserId) - .collect(Collectors.toList()); - } - } else { - regionDegreeExpertIdList = evidenceHasBeenSubmittedExpertInfoList.stream() - .map(ExpertUserFullInfo::getUserId) - .collect(Collectors.toList()); - } - - if (CollectionUtil.isNotEmpty(regionDegreeExpertIdList)) { - // 区域学历分布 - List degreeExpertDictionaryList = iExpertDictionaryService - .listByUserId(regionDegreeExpertIdList, ExpertDictTypeEnum.DEGREE); - Map> degreeCodeMap = degreeExpertDictionaryList.stream() - .map(ExpertDictionary::getDictionaryCode) - .collect(Collectors.groupingBy(Function.identity())); - AnalysisChart regionExpertEducationChartAnalysisChart = - dashboardChartAssembler.assemblerAnalysisChart(degreeCodeMap, ChartTypeEnum.REGION_EXPERT_EDUCATION_CHART); - analysisChartList.add(regionExpertEducationChartAnalysisChart); - - // 区域职称级别分布 - List titleLevelExpertDictionaryList = iExpertDictionaryService - .listByUserId(regionDegreeExpertIdList, ExpertDictTypeEnum.TITLE_LEVEL); - Map> titleLevelCodeMap = titleLevelExpertDictionaryList.stream() - .collect(Collectors.groupingBy(ExpertDictionary::getDictionaryCode)); - AnalysisChart regionExpertTitleLevelChartAnalysisChart = - dashboardChartAssembler.assemblerAnalysisChart(titleLevelCodeMap, ChartTypeEnum.REGION_EXPERT_TITLE_LEVEL_CHART); - analysisChartList.add(regionExpertTitleLevelChartAnalysisChart); - } - - // 评审次数 - List normalMeetingList = iMeetingService.list(Wrappers.lambdaQuery(Meeting.class) - .ne(Meeting::getStatus, MeetingStatusEnum.CANCELED.getCode())); - Integer meetingCnt = normalMeetingList.size(); - - // 各类型评审次数 - Map> meetingTypeMap = normalMeetingList.stream().collect(Collectors.groupingBy(Meeting::getType)); - AnalysisChart meetingTypeCntChartAnalysisChart = - dashboardChartAssembler.assemblerAnalysisChart(meetingTypeMap, ChartTypeEnum.MEETING_TYPE_CNT_CHART); - analysisChartList.add(meetingTypeCntChartAnalysisChart); - - // 明星专家列表 - List starExpertList = new ArrayList<>(); - List meetingExpertJudgeList = iMeetingExpertJudgeService.list(); - Map> expertIdMeetingExpertJudgeMap = meetingExpertJudgeList.stream() - .collect(Collectors.groupingBy(MeetingExpertJudge::getExpertId)); - Map expertIdExpertNameMap = evidenceHasBeenSubmittedExpertInfoList.stream() - .collect(Collectors.toMap(ExpertUserFullInfo::getUserId, ExpertUserFullInfo::getExpertName)); - - for (Long expertId : expertIdMeetingExpertJudgeMap.keySet()) { - String expertName = expertIdExpertNameMap.get(expertId); - List expertMeetingExpertJudgeList = expertIdMeetingExpertJudgeMap.get(expertId); - DoubleSummaryStatistics statistics = expertMeetingExpertJudgeList - .stream().map(MeetingExpertJudge::getScore) - .filter(Objects::nonNull).mapToDouble(Number::doubleValue).summaryStatistics(); - double average = statistics.getAverage(); - StarExpertBO starExpertBO = new StarExpertBO(); - starExpertBO.setAveragePerformanceScore(average); - starExpertBO.setExpertId(expertId); - starExpertBO.setExpertName(expertName); - starExpertList.add(starExpertBO); - } - starExpertList = starExpertList.stream() - .sorted(Comparator.comparing(StarExpertBO::getAveragePerformanceScore) - .reversed()).collect(Collectors.toList()); - if (starExpertList.size() > 5) { - starExpertList = starExpertList.subList(0, 5); - } - - // 装配返回类 - ExpertDashboardSummaryVO expertDashboardSummaryVO = new ExpertDashboardSummaryVO(); - expertDashboardSummaryVO.setMeetingCnt(meetingCnt); - expertDashboardSummaryVO.setStarExpertList(starExpertList); - expertDashboardSummaryVO.setAnalysisChartList(analysisChartList); - return expertDashboardSummaryVO; - } - -} - diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardProjectManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardProjectManage.java index 98ab64a..14ab55a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardProjectManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardProjectManage.java @@ -7,8 +7,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; -import com.ningdatech.basic.util.StrPool; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.dashboard.constant.ChartTypeEnum; import com.hz.pm.api.dashboard.constant.DashboardConstant; import com.hz.pm.api.dashboard.handle.ApplicationHandler; @@ -29,16 +28,12 @@ import com.hz.pm.api.gov.service.IGovOperationProjectBaseinfoService; import com.hz.pm.api.portrait.service.IProjectTagService; import com.hz.pm.api.projectdeclared.model.entity.Purchase; import com.hz.pm.api.projectdeclared.service.IPurchaseService; -import com.hz.pm.api.projectlib.enumeration.InstTypeEnum; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.InstTypeEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import com.hz.pm.api.projectlib.model.entity.ProjectDelayApply; import com.hz.pm.api.projectlib.service.INdProjectDelayApplyService; import com.hz.pm.api.projectlib.service.IProjectService; -import com.hz.pm.api.sys.model.req.NoticeListReq; -import com.hz.pm.api.todocenter.model.req.ToBeProcessedReq; -import com.hz.pm.api.todocenter.model.vo.TodoCenterStatisticsVO; -import com.hz.pm.api.workbench.converter.WorkbenchConverter; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/EarlyWarningStatisticsManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/EarlyWarningStatisticsManage.java index 92aa113..09e5009 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/EarlyWarningStatisticsManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/EarlyWarningStatisticsManage.java @@ -7,9 +7,9 @@ import com.google.common.collect.Lists; import com.hz.pm.api.common.enumeration.ProjectProcessStageEnum; import com.hz.pm.api.common.model.entity.DataDTO; import com.hz.pm.api.dashboard.model.vo.EarlyWarningStatisticsVO; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; -import com.hz.pm.api.projectlib.enumeration.WarningFlowTypeEnum; -import com.hz.pm.api.projectlib.enumeration.WarningOperationTypeEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.WarningFlowTypeEnum; +import com.hz.pm.api.projectlib.model.enumeration.WarningOperationTypeEnum; import com.hz.pm.api.projectlib.model.entity.Project; import com.hz.pm.api.projectlib.model.entity.ProjectInst; import com.hz.pm.api.projectlib.service.IProjectInstService; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/FundStatisticsManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/FundStatisticsManage.java index 9377bc5..6d623c1 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/FundStatisticsManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/FundStatisticsManage.java @@ -12,7 +12,7 @@ import com.hz.pm.api.gov.service.IGovBizProjectApplyService; import com.hz.pm.api.gov.service.IGovBizProjectApproveService; import com.hz.pm.api.gov.service.IGovBizProjectBaseinfoService; import com.hz.pm.api.gov.service.IGovBizProjectProcureService; -import com.hz.pm.api.projectlib.enumeration.ProjectStatusEnum; +import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum; import com.hz.pm.api.projectlib.model.entity.Project; import com.hz.pm.api.projectlib.service.IProjectService; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/model/DataScopeDTO.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/model/DataScopeDTO.java index 728f26e..fe34a59 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/model/DataScopeDTO.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/model/DataScopeDTO.java @@ -1,6 +1,6 @@ package com.hz.pm.api.datascope.model; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import lombok.Data; import java.util.List; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/DashboardUserDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/DashboardUserDataScopeProviderImpl.java index 417408b..3c05d8a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/DashboardUserDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/DashboardUserDataScopeProviderImpl.java @@ -4,7 +4,7 @@ import com.google.common.collect.Lists; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertAdminDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertAdminDataScopeProviderImpl.java index 914555a..a8682a4 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertAdminDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertAdminDataScopeProviderImpl.java @@ -6,7 +6,7 @@ import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; import com.hz.pm.api.sys.model.dto.RegionDTO; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.security.model.UserInfoDetails; import com.hz.pm.api.user.util.LoginUserUtil; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertDataScopeProviderImpl.java index 1206211..6beb2ba 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/ExpertDataScopeProviderImpl.java @@ -1,11 +1,11 @@ package com.hz.pm.api.datascope.provider.impl; -import com.hz.pm.api.common.constant.RegionConst; +import com.hz.pm.api.common.model.constant.RegionConst; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/HigherUserDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/HigherUserDataScopeProviderImpl.java index d99f285..e2eb72b 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/HigherUserDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/HigherUserDataScopeProviderImpl.java @@ -2,12 +2,12 @@ package com.hz.pm.api.datascope.provider.impl; import cn.hutool.core.collection.CollUtil; import com.google.common.collect.Lists; -import com.hz.pm.api.common.constant.RegionConst; +import com.hz.pm.api.common.model.constant.RegionConst; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrdinaryUserDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrdinaryUserDataScopeProviderImpl.java index 617bab3..7023b7f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrdinaryUserDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrdinaryUserDataScopeProviderImpl.java @@ -4,7 +4,7 @@ import com.google.common.collect.Lists; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrgAdminDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrgAdminDataScopeProviderImpl.java index c7a93ed..f148a16 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrgAdminDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/OrgAdminDataScopeProviderImpl.java @@ -3,7 +3,7 @@ package com.hz.pm.api.datascope.provider.impl; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/RegionAdminDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/RegionAdminDataScopeProviderImpl.java index 9ff2767..4e68d35 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/RegionAdminDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/RegionAdminDataScopeProviderImpl.java @@ -2,12 +2,12 @@ package com.hz.pm.api.datascope.provider.impl; import cn.hutool.core.collection.CollUtil; import com.google.common.collect.Lists; -import com.hz.pm.api.common.constant.RegionConst; +import com.hz.pm.api.common.model.constant.RegionConst; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/SuperAdminDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/SuperAdminDataScopeProviderImpl.java index 34126c3..91ae124 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/SuperAdminDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/SuperAdminDataScopeProviderImpl.java @@ -1,11 +1,11 @@ package com.hz.pm.api.datascope.provider.impl; -import com.hz.pm.api.common.constant.RegionConst; +import com.hz.pm.api.common.model.constant.RegionConst; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/VisitoyDataScopeProviderImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/VisitoyDataScopeProviderImpl.java index 16daf8e..5ae6341 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/VisitoyDataScopeProviderImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/provider/impl/VisitoyDataScopeProviderImpl.java @@ -3,7 +3,7 @@ package com.hz.pm.api.datascope.provider.impl; import com.hz.pm.api.common.helper.UserInfoHelper; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeProvider; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserFullInfoDTO; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/EmployeeBatchGetTask.java b/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/EmployeeBatchGetTask.java index a87e3c4..bfcfbbc 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/EmployeeBatchGetTask.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/EmployeeBatchGetTask.java @@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; import com.ningdatech.basic.function.VUtils; import com.ningdatech.basic.model.GenericResult; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.ding.constants.DingOrganizationContant; import com.hz.pm.api.organization.model.entity.DingEmployeeInfo; import com.hz.pm.api.organization.model.entity.DingOrganization; import com.hz.pm.api.organization.service.IDingEmployeeInfoService; import com.hz.pm.api.organization.service.IDingOrganizationService; -import com.hz.pm.api.user.constant.UserAvailableEnum; +import com.hz.pm.api.user.model.enumeration.UserAvailableEnum; import com.hz.pm.api.user.entity.UserInfo; import com.hz.pm.api.user.service.IUserInfoService; import com.ningdatech.zwdd.ZwddIntegrationProperties; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/OrganizationBatchGetTask.java b/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/OrganizationBatchGetTask.java index a93c0e7..a51a31f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/OrganizationBatchGetTask.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/ding/task/OrganizationBatchGetTask.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; import com.ningdatech.basic.model.GenericResult; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.ding.model.DingOrgInfoTreeDTO; import com.hz.pm.api.organization.model.entity.DingOrganization; import com.hz.pm.api.organization.service.IDingOrganizationService; @@ -18,7 +18,6 @@ import com.ningdatech.zwdd.model.dto.DingScopesV2DTO; import com.ningdatech.zwdd.model.dto.PageSubOrganizationCodeDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertUserInfoAssembler.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertUserInfoAssembler.java index d3abc60..7ed854d 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertUserInfoAssembler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertUserInfoAssembler.java @@ -363,8 +363,6 @@ public class ExpertUserInfoAssembler { expert.setAddress(expertFullInfo.getAddress()); expert.setExperience(expertFullInfo.getExperience()); expert.setAcademicTitle(expertFullInfo.getAcademicTitle()); - expert.setRegionCode(expertFullInfo.getRegionCode()); - expert.setRegionLevel(expertFullInfo.getRegionLevel()); expert.setRecommendFile(expertFullInfo.getRecommendFile()); return expert; } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java index 9fbe2ed..9b5741e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/entity/ExpertUserFullInfo.java @@ -43,6 +43,8 @@ public class ExpertUserFullInfo implements Serializable { */ private String mhUserId; + private String mhExpertId; + /** * 专家编号 */ @@ -92,10 +94,6 @@ public class ExpertUserFullInfo implements Serializable { private String email; - private String regionCode; - - private Integer regionLevel; - /** * 企业ID */ @@ -236,16 +234,10 @@ public class ExpertUserFullInfo implements Serializable { @ApiModelProperty("工作简历") private String resume; - /** - * TODO：重新处理单位 - */ - @TableField(exist = false) + //================================================================================================================== + private String companyUniqCode; - /** - * TODO：重新处理单位 - */ - @TableField(exist = false) private String company; } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/PermissionCheckHelper.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/PermissionCheckHelper.java index a77df07..a0ae76f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/PermissionCheckHelper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/PermissionCheckHelper.java @@ -1,6 +1,6 @@ package com.hz.pm.api.expert.helper; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.security.model.UserInfoDetails; import com.hz.pm.api.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertAdminManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertAdminManage.java index 8091654..a056c1e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertAdminManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertAdminManage.java @@ -25,7 +25,6 @@ import com.hz.pm.api.expert.model.cmd.ExpertAdminExpertManageQueryCmd; import com.hz.pm.api.expert.model.cmd.ExpertInfoModifyCmd; import com.hz.pm.api.expert.model.dto.ExpertAdminExpertListDTO; import com.hz.pm.api.expert.model.query.ExpertDictionaryQuery; -import com.hz.pm.api.expert.model.query.ExpertTagQuery; import com.hz.pm.api.expert.model.req.AdminExpertBasicInfoModifyRequest; import com.hz.pm.api.expert.model.req.GetZzdInfoRequest; import com.hz.pm.api.expert.model.req.MetaApplyResultRequest; @@ -36,9 +35,6 @@ import com.hz.pm.api.expert.service.ExpertAdminManageService; import com.hz.pm.api.expert.service.ExpertInfoService; import com.hz.pm.api.expert.service.IExpertMetaApplyService; import com.hz.pm.api.meta.constant.ExpertDictTypeEnum; -import com.hz.pm.api.meta.constant.ExpertTagEnum; -import com.hz.pm.api.meta.model.ExpertRegionInfo; -import com.hz.pm.api.meta.model.bo.RegionContainsBO; import com.hz.pm.api.user.util.LoginUserUtil; import com.ningdatech.zwdd.client.ZwddClient; import com.ningdatech.zwdd.model.dto.DingInfoByMobileDTO; @@ -74,25 +70,24 @@ public class ExpertAdminManage { /** * 专家管理员使用 专家库列表查询 * - * @param query - * @return + * @param query \ + * @return \ */ public PageVo getExpertLibraryList(ExpertLibraryReq query) { - Long userId = LoginUserUtil.getUserId(); - ExpertAdminExpertManageQueryCmd queryCmd = buildExpertAdminExpertManageQueryCmd(query, userId); + ExpertAdminExpertManageQueryCmd queryCmd = buildExpertAdminExpertManageQueryCmd(query); if (queryCmd.isHasNonData()) { return PageVo.empty(); } - CommonPage pageResult = expertAdminManageService.getExpertLibraryList(queryCmd); + CommonPage page = expertAdminManageService.getExpertLibraryList(queryCmd); PageVo pageVo = new PageVo<>(); - pageVo.setTotal(pageResult.getItemsTotal()); - pageVo.setRecords(expertAdminExpertManageAssembler.toViews(pageResult.getItems())); + pageVo.setTotal(page.getItemsTotal()); + pageVo.setRecords(expertAdminExpertManageAssembler.toViews(page.getItems())); return pageVo; } - private ExpertAdminExpertManageQueryCmd buildExpertAdminExpertManageQueryCmd(ExpertLibraryReq query, Long userId) { + private ExpertAdminExpertManageQueryCmd buildExpertAdminExpertManageQueryCmd(ExpertLibraryReq query) { ExpertAdminExpertManageQueryCmd queryCmd = new ExpertAdminExpertManageQueryCmd(); queryCmd.setPageNumber(query.getPageNumber()); queryCmd.setPageSize(query.getPageSize()); @@ -102,39 +97,26 @@ public class ExpertAdminManage { if (StrUtils.isNotBlank(query.getCompany())) { queryCmd.setCompany(query.getCompany()); } - List expertDictQueryList = new ArrayList<>(); - if (StringUtils.isNotBlank(query.getTitleLevelDictionaryCode())) { + List dictQuery = new ArrayList<>(); + if (StrUtils.isNotBlank(query.getTitleLevelDictionaryCode())) { ExpertDictionaryQuery expertDictQuery = new ExpertDictionaryQuery(); expertDictQuery.setExpertInfoField(ExpertDictTypeEnum.TITLE_LEVEL.getKey()); expertDictQuery.setDictionaryCodeList(CollectionUtil.toList(query.getTitleLevelDictionaryCode())); - expertDictQueryList.add(expertDictQuery); + dictQuery.add(expertDictQuery); } - if (StringUtils.isNotBlank(query.getCompanyAttributeDictionaryCode())) { + if (StrUtils.isNotBlank(query.getCompanyAttributeDictionaryCode())) { ExpertDictionaryQuery expertDictQuery = new ExpertDictionaryQuery(); expertDictQuery.setExpertInfoField(ExpertDictTypeEnum.COMPANY_ATTRIBUTE.getKey()); expertDictQuery.setDictionaryCodeList(CollectionUtil.toList(query.getCompanyAttributeDictionaryCode())); - expertDictQueryList.add(expertDictQuery); + dictQuery.add(expertDictQuery); } - if (StringUtils.isNotBlank(query.getExpertTypeDictionaryCode())) { + if (StrUtils.isNotBlank(query.getExpertTypeDictionaryCode())) { ExpertDictionaryQuery expertDictQuery = new ExpertDictionaryQuery(); expertDictQuery.setExpertInfoField(ExpertDictTypeEnum.EXPERT_TYPE.getKey()); expertDictQuery.setDictionaryCodeList(CollectionUtil.toList(query.getExpertTypeDictionaryCode())); - expertDictQueryList.add(expertDictQuery); - } - List expertTagQueryList = new ArrayList<>(); - if (StringUtils.isNotBlank(query.getExpertSourceTagCode())) { - ExpertTagQuery expertTagQuery = new ExpertTagQuery(); - expertTagQuery.setExpertInfoField(ExpertTagEnum.EXPERT_SOURCE.getKey()); - expertTagQuery.setTagCodeList(CollectionUtil.toList(query.getExpertSourceTagCode())); - expertTagQueryList.add(expertTagQuery); - } - if (StringUtils.isNotBlank(query.getGoodAtTagCode())) { - ExpertTagQuery expertTagQuery = new ExpertTagQuery(); - expertTagQuery.setExpertInfoField(ExpertTagEnum.GOOD_AT.getKey()); - expertTagQuery.setTagCodeList(CollectionUtil.toList(query.getGoodAtTagCode())); - expertTagQueryList.add(expertTagQuery); + dictQuery.add(expertDictQuery); } - if (StringUtils.isNotBlank(query.getExpertAccountStatus())) { + if (StrUtils.isNotBlank(query.getExpertAccountStatus())) { QueryExpertAccountStatusEnum queryExpertAccountStatus = QueryExpertAccountStatusEnum.of(query.getExpertAccountStatus()); switch (queryExpertAccountStatus) { case NORMAL: @@ -150,53 +132,8 @@ public class ExpertAdminManage { queryCmd.setExpertAccountStatusList(CollectionUtil.toList(ExpertAccountStatusEnum.AVAILABLE, ExpertAccountStatusEnum.FREEZE)); } - List expertAdminContainsRegionList; - // 如果为超级管理员，可以查看所有的专家，包括没有层级的专家 - boolean isSuperAdmin; - if (!(isSuperAdmin = permissionCheckHelper.isSuperAdmin())) { - expertAdminContainsRegionList = regionLimitHelper.getExpertAdminContainsRegion(userId); - } else { - expertAdminContainsRegionList = Collections.emptyList(); - } - - List containsRegion = null; - if (Objects.nonNull(query.getExpertRegionInfo())) { - RegionContainsBO containsRegionBo = regionLimitHelper.getContainsRegionBo(query.getExpertRegionInfo().getRegionLevel() - , query.getExpertRegionInfo().getRegionCode()); - if (isSuperAdmin) { - containsRegion = Collections.singletonList(containsRegionBo); - } else { - containsRegion = regionLimitHelper.queryContainsRegionAssembler(containsRegionBo, expertAdminContainsRegionList); - if (containsRegion.isEmpty()) { - queryCmd.setHasNonData(true); - return queryCmd; - } - } - } - - List intentionRegions = null; - if (query.getIntentionRegionInfo() != null) { - ExpertRegionInfo intentionRegionInfo = query.getIntentionRegionInfo(); - RegionContainsBO containsRegionBo = regionLimitHelper.getContainsRegionBo(intentionRegionInfo.getRegionLevel() - , intentionRegionInfo.getRegionCode()); - if (isSuperAdmin) { - intentionRegions = Collections.singletonList(containsRegionBo); - } else { - intentionRegions = regionLimitHelper.queryContainsRegionAssembler(containsRegionBo, expertAdminContainsRegionList); - if (intentionRegions.isEmpty()) { - queryCmd.setHasNonData(true); - return queryCmd; - } - } - } - if (containsRegion == null && intentionRegions == null) { - containsRegion = expertAdminContainsRegionList; - } - queryCmd.setExpertDictionaryQueryList(expertDictQueryList); - queryCmd.setExpertTagQueryList(expertTagQueryList); + queryCmd.setExpertDictionaryQueryList(dictQuery); queryCmd.setIsDingUser(query.getIsDingUser()); - queryCmd.setRegionContainsList(containsRegion); - queryCmd.setIntentionRegionList(intentionRegions); queryCmd.setPageSize(query.getPageSize()); queryCmd.setPageNumber(query.getPageNumber()); return queryCmd; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertManage.java index bdcfb75..76e980c 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertManage.java @@ -3,7 +3,7 @@ package com.hz.pm.api.expert.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.common.model.entity.KeyValDTO; import com.hz.pm.api.expert.assembler.ExpertInfoCmdAssembler; import com.hz.pm.api.expert.entity.ExpertUserFullInfo; @@ -17,6 +17,7 @@ import com.hz.pm.api.expert.model.vo.ExpertDetailVO; import com.hz.pm.api.expert.model.vo.ExpertPortraitVO; import com.hz.pm.api.expert.service.ExpertInfoService; import com.hz.pm.api.expert.service.IExpertUserFullInfoService; +import com.hz.pm.api.external.MhExpertQrCodeGenClient; import com.hz.pm.api.meeting.entity.domain.MeetingExpertJudge; import com.hz.pm.api.meeting.entity.dto.ExpertInvitedRecordDTO; import com.hz.pm.api.meeting.entity.enumeration.ExpertAttendStatusEnum; @@ -35,9 +36,9 @@ import com.hz.pm.api.sys.model.entity.Role; import com.hz.pm.api.sys.model.entity.UserRole; import com.hz.pm.api.sys.service.IRoleService; import com.hz.pm.api.sys.service.IUserRoleService; -import com.hz.pm.api.user.constant.UserAvailableEnum; +import com.hz.pm.api.user.model.enumeration.UserAvailableEnum; import com.hz.pm.api.user.entity.UserInfo; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; +import com.hz.pm.api.user.model.enumeration.RoleEnum; import com.hz.pm.api.user.service.IUserInfoService; import com.hz.pm.api.user.util.LoginUserUtil; import com.ningdatech.basic.exception.BizException; @@ -79,6 +80,7 @@ public class ExpertManage { private final IMeetingExpertJudgeService expertJudgeService; private final IExpertDictionaryService expertDictionaryService; private final DictionaryCache dictionaryCache; + private final MhExpertQrCodeGenClient expertQrCodeGenClient; @Value("${expert-registration.verify-code.check:true}") @@ -133,6 +135,8 @@ public class ExpertManage { if (expertType != null) { isTechExpert = expertType.get(0).getDictionaryName().contains("技术"); } + String expertQrCode = expertQrCodeGenClient.genExpertQrCode(eui.getMhExpertId()); + expertDetail.setExpertQrCodeBase64(expertQrCode); expertDetail.setIsTechExpert(isTechExpert); return expertDetail; } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertMetaApplyManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertMetaApplyManage.java index e92612b..678d0e4 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertMetaApplyManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ExpertMetaApplyManage.java @@ -383,16 +383,6 @@ public class ExpertMetaApplyManage { } expertApplyMetaVO.setName(expertUserFullInfo.getExpertName()); - RegionDTO regionDTO = regionCacheHelper.getByCodeAndLevel(expertUserFullInfo.getRegionCode(), expertUserFullInfo.getRegionLevel()); - - if (Objects.nonNull(regionDTO)) { - ExpertRegionInfo expertRegionInfo = new ExpertRegionInfo(); - expertRegionInfo.setRegionCode(expertUserFullInfo.getRegionCode()); - expertRegionInfo.setRegionLevel(expertUserFullInfo.getRegionLevel()); - expertRegionInfo.setRegionName(regionDTO.getRegionName()); - expertApplyMetaVO.setExpertRegionInfo(expertRegionInfo); - } - List titleLevelDictionaryList = titleLevelDictMap.get(userId); if (CollectionUtils.isNotEmpty(titleLevelDictionaryList)) { expertApplyMetaVO.setTitleLevel(titleLevelDictionaryList.stream().map(r -> { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ReviewTemplateSettingsManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ReviewTemplateSettingsManage.java index 65e1faf..037aab4 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ReviewTemplateSettingsManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/manage/ReviewTemplateSettingsManage.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.exception.BizException; import com.ningdatech.basic.util.CollUtils; -import com.hz.pm.api.common.constant.BizConst; +import com.hz.pm.api.common.model.constant.BizConst; import com.hz.pm.api.expert.model.dto.ReviewTemplateSettingsDTO; import com.hz.pm.api.expert.model.entity.ReviewTemplateSettings; import com.hz.pm.api.expert.model.enumeration.ReviewTemplateTypeEnum; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/mapper/ExpertAdminManageMapper.xml b/hz-pm-api/src/main/java/com/hz/pm/api/expert/mapper/ExpertAdminManageMapper.xml index 9e018fd..f50cc50 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/mapper/ExpertAdminManageMapper.xml +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/mapper/ExpertAdminManageMapper.xml @@ -11,39 +11,12 @@ AND company LIKE CONCAT('%',#{query.company, jdbcType=BIGINT},'%') - - AND region_code = #{query.regionCode} AND region_level = #{query.regionLevel} - AND is_ding_user = 'Y' AND is_ding_user = 'N' - - AND ( - - (= #{regionContains.parentRegionTreeLevel} AND region_code IN ]]> - #{containsRegionCode} - - ) - - ) - - - AND exists(select 1 from expert_intention_work_region eiwr where eiwr.user_id = nd_expert_user_full_info.user_id and - - (= #{intentionRegions.parentRegionTreeLevel} AND region_code IN ]]> - #{intentionRegionCode} - - ) - - ) - ORDER BY update_on DESC @@ -106,14 +79,6 @@