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/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/constant/BaseFieldConst.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java similarity index 89% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BaseFieldConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BaseFieldConst.java index 928f673..2b7d4bf 100644 --- 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/model/constant/BaseFieldConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; /** *

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/model/constant/BizConst.java similarity index 98% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BizConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BizConst.java index e7e5fa6..5f90688 100644 --- 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/model/constant/BizConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; import com.ningdatech.basic.model.ApiResponse; 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/model/constant/BooleanBit.java similarity index 78% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/BooleanBit.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/BooleanBit.java index 6c49d0a..57e1fc2 100644 --- 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/model/constant/BooleanBit.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; /** *

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/model/constant/CommonConst.java similarity index 97% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/CommonConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/CommonConst.java index 2cbff53..47d4131 100644 --- 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/model/constant/CommonConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; /** * @description: 常量 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/model/constant/DefValConst.java similarity index 91% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DefValConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DefValConst.java index 2a6b6a5..fe21b98 100644 --- 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/model/constant/DefValConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; import com.ningdatech.basic.util.StrPool; 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/model/constant/DingConst.java similarity index 80% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/DingConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/DingConst.java index 33b0959..17c4eaa 100644 --- 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/model/constant/DingConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; /** * 浙政钉常量 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/model/constant/ProjectDeclareConst.java similarity index 99% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/ProjectDeclareConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/ProjectDeclareConst.java index 031d68e..87e9e93 100644 --- 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/model/constant/ProjectDeclareConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; import java.math.BigDecimal; 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/model/constant/RegionConst.java similarity index 97% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/RegionConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/RegionConst.java index dea5ee1..31214c1 100644 --- 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/model/constant/RegionConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; import com.google.common.collect.Lists; 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/model/constant/StateMachineConst.java similarity index 86% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/constant/StateMachineConst.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/model/constant/StateMachineConst.java index f7acc26..c9ce670 100644 --- 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/model/constant/StateMachineConst.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.constant; +package com.hz.pm.api.common.model.constant; /** * @author CMM 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/contants/RegionContant.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java similarity index 94% rename from hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contants/RegionContant.java rename to hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/contant/RegionContant.java index 6614aa5..b436de1 100644 --- 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/contant/RegionContant.java @@ -1,4 +1,4 @@ -package com.hz.pm.api.common.statemachine.contants; +package com.hz.pm.api.common.statemachine.contant; /** * @Classname RegionContant 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 @@