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/lib/agent-boot-1.3.22.0215.jar b/hz-pm-api/lib/agent-boot-1.3.22.0215.jar deleted file mode 100644 index bee98fb..0000000 Binary files a/hz-pm-api/lib/agent-boot-1.3.22.0215.jar and /dev/null differ diff --git a/hz-pm-api/lib/commons-compress-1.19.jar b/hz-pm-api/lib/commons-compress-1.19.jar deleted file mode 100644 index 5c9f52a..0000000 Binary files a/hz-pm-api/lib/commons-compress-1.19.jar and /dev/null differ diff --git a/hz-pm-api/lib/commons-io-2.5.jar b/hz-pm-api/lib/commons-io-2.5.jar deleted file mode 100644 index 107b061..0000000 Binary files a/hz-pm-api/lib/commons-io-2.5.jar and /dev/null differ diff --git a/hz-pm-api/lib/commons-lang-2.6.jar b/hz-pm-api/lib/commons-lang-2.6.jar deleted file mode 100644 index 98467d3..0000000 Binary files a/hz-pm-api/lib/commons-lang-2.6.jar and /dev/null differ diff --git a/hz-pm-api/lib/commons-lang3-3.8.1.jar b/hz-pm-api/lib/commons-lang3-3.8.1.jar deleted file mode 100644 index 2c65ce6..0000000 Binary files a/hz-pm-api/lib/commons-lang3-3.8.1.jar and /dev/null differ diff --git a/hz-pm-api/lib/commons-logging-1.1.1.jar b/hz-pm-api/lib/commons-logging-1.1.1.jar deleted file mode 100644 index 1deef14..0000000 Binary files a/hz-pm-api/lib/commons-logging-1.1.1.jar and /dev/null differ diff --git a/hz-pm-api/lib/dom4j-2.0.2.jar b/hz-pm-api/lib/dom4j-2.0.2.jar deleted file mode 100644 index 7039b80..0000000 Binary files a/hz-pm-api/lib/dom4j-2.0.2.jar and /dev/null differ diff --git a/hz-pm-api/lib/gson-2.8.0.jar b/hz-pm-api/lib/gson-2.8.0.jar deleted file mode 100644 index 1235f63..0000000 Binary files a/hz-pm-api/lib/gson-2.8.0.jar and /dev/null differ diff --git a/hz-pm-api/lib/httpclient-4.5.13.jar b/hz-pm-api/lib/httpclient-4.5.13.jar deleted file mode 100644 index 218ee25..0000000 Binary files a/hz-pm-api/lib/httpclient-4.5.13.jar and /dev/null differ diff --git a/hz-pm-api/lib/httpcore-4.4.13.jar b/hz-pm-api/lib/httpcore-4.4.13.jar deleted file mode 100644 index 163dc43..0000000 Binary files a/hz-pm-api/lib/httpcore-4.4.13.jar and /dev/null differ diff --git a/hz-pm-api/lib/httpmime-4.5.13.jar b/hz-pm-api/lib/httpmime-4.5.13.jar deleted file mode 100644 index cc52f44..0000000 Binary files a/hz-pm-api/lib/httpmime-4.5.13.jar and /dev/null differ diff --git a/hz-pm-api/lib/jbArchivesTools-1.0-SNAPSHOT.jar b/hz-pm-api/lib/jbArchivesTools-1.0-SNAPSHOT.jar deleted file mode 100644 index 460fca6..0000000 Binary files a/hz-pm-api/lib/jbArchivesTools-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/hz-pm-api/lib/ofd-simple-tool-1.0.23.0324.jar b/hz-pm-api/lib/ofd-simple-tool-1.0.23.0324.jar deleted file mode 100644 index a3eaea3..0000000 Binary files a/hz-pm-api/lib/ofd-simple-tool-1.0.23.0324.jar and /dev/null differ diff --git a/hz-pm-api/lib/slf4j-api-1.7.29.jar b/hz-pm-api/lib/slf4j-api-1.7.29.jar deleted file mode 100644 index 81ed475..0000000 Binary files a/hz-pm-api/lib/slf4j-api-1.7.29.jar and /dev/null differ diff --git a/hz-pm-api/lib/slf4j-simple-1.7.26.jar b/hz-pm-api/lib/slf4j-simple-1.7.26.jar deleted file mode 100644 index 5d82cdf..0000000 Binary files a/hz-pm-api/lib/slf4j-simple-1.7.26.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-agent-http-1.7.220630.jar b/hz-pm-api/lib/suwell-agent-http-1.7.220630.jar deleted file mode 100644 index 0873d69..0000000 Binary files a/hz-pm-api/lib/suwell-agent-http-1.7.220630.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-agent-wrapper-1.6.221208.jar b/hz-pm-api/lib/suwell-agent-wrapper-1.6.221208.jar deleted file mode 100644 index 374c378..0000000 Binary files a/hz-pm-api/lib/suwell-agent-wrapper-1.6.221208.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-bank-extend-1.8.28.0627-sgcc.jar b/hz-pm-api/lib/suwell-bank-extend-1.8.28.0627-sgcc.jar deleted file mode 100644 index 9218cde..0000000 Binary files a/hz-pm-api/lib/suwell-bank-extend-1.8.28.0627-sgcc.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-convert-base-1.5.19.0408.jar b/hz-pm-api/lib/suwell-convert-base-1.5.19.0408.jar deleted file mode 100644 index 67469ef..0000000 Binary files a/hz-pm-api/lib/suwell-convert-base-1.5.19.0408.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-core-base-1.7.220623-lite.jar b/hz-pm-api/lib/suwell-core-base-1.7.220623-lite.jar deleted file mode 100644 index 453c0c9..0000000 Binary files a/hz-pm-api/lib/suwell-core-base-1.7.220623-lite.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-extend-1.0.22.0804.jar b/hz-pm-api/lib/suwell-extend-1.0.22.0804.jar deleted file mode 100644 index 82b6c26..0000000 Binary files a/hz-pm-api/lib/suwell-extend-1.0.22.0804.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-packet-wrapper-1.21.230306.jar b/hz-pm-api/lib/suwell-packet-wrapper-1.21.230306.jar deleted file mode 100644 index a85805d..0000000 Binary files a/hz-pm-api/lib/suwell-packet-wrapper-1.21.230306.jar and /dev/null differ diff --git a/hz-pm-api/lib/suwell-rpc-manager-client-2.7.211125.jar b/hz-pm-api/lib/suwell-rpc-manager-client-2.7.211125.jar deleted file mode 100644 index 1c9351b..0000000 Binary files a/hz-pm-api/lib/suwell-rpc-manager-client-2.7.211125.jar and /dev/null differ diff --git a/hz-pm-api/pom.xml b/hz-pm-api/pom.xml index 9f968da..0a30453 100644 --- a/hz-pm-api/pom.xml +++ b/hz-pm-api/pom.xml @@ -262,117 +262,6 @@ cn.afterturn easypoi-base - - com.agent - agent-boot - 1.3.22 - system - ${project.basedir}/lib/agent-boot-1.3.22.0215.jar - - - - com.agent - agent-boot - 1.3.22 - system - ${project.basedir}/lib/agent-boot-1.3.22.0215.jar - - - - com.suwell - suwell-agent-http - 1.7 - system - ${project.basedir}/lib/suwell-agent-http-1.7.220630.jar - - - - com.suwell - suwell-agent-wrapper - 1.6 - system - ${project.basedir}/lib/suwell-agent-wrapper-1.6.221208.jar - - - - com.slf4j - slf4j-api - 1.7.29 - system - ${project.basedir}/lib/slf4j-api-1.7.29.jar - - - - com.httpclient - httpclient - 4.5.13 - system - ${project.basedir}/lib/httpclient-4.5.13.jar - - - - com.httpcore - httpcore - 4.4.13 - system - ${project.basedir}/lib/httpcore-4.4.13.jar - - - - com.httpmime - httpmime - 4.5.13 - system - ${project.basedir}/lib/httpmime-4.5.13.jar - - - - com.jbArchivesTools - jbArchivesTools - 1.0 - system - ${project.basedir}/lib/jbArchivesTools-1.0-SNAPSHOT.jar - - - - com.suwell - suwell-convert-base - 1.5.19 - system - ${project.basedir}/lib/suwell-convert-base-1.5.19.0408.jar - - - - com.gson - gson - 2.8.0 - system - ${project.basedir}/lib/gson-2.8.0.jar - - - - com.suwell - suwell-rpc-manager-client - 2.7 - system - ${project.basedir}/lib/suwell-rpc-manager-client-2.7.211125.jar - - - - com.suwell - suwell-packet-wrapper - 1.21 - system - ${project.basedir}/lib/suwell-packet-wrapper-1.21.230306.jar - - - - com.dom4j - dom4j - 2.0.2 - system - ${project.basedir}/lib/dom4j-2.0.2.jar - @@ -385,18 +274,6 @@ - test - - test - - - - pre - - pre - - - prod prod 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/handler/GlobalResponseHandler.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/GlobalResponseHandler.java index 79f7d13..0226f44 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/GlobalResponseHandler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/handler/GlobalResponseHandler.java @@ -11,10 +11,13 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; /** - * @Author liuxinxin - * @Date 2021/7/21 11:26 - * @Version 1.0 - **/ + *

+ * GlobalResponseHandler + *

+ * + * @author WendyYang + * @since 10:29 2023/12/29 + */ @RestControllerAdvice(basePackages = { "com.hz.pm.api.fiscal.controller", "com.hz.pm.api.organization.controller", @@ -37,6 +40,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; "com.hz.pm.api.gov.controller", "com.hz.pm.api.dashboard.controller", "com.hz.pm.api.wps.controller", + "com.hz.pm.api.external.controller", "com.hz.pm.api.gov.controller" }) public class GlobalResponseHandler implements ResponseBodyAdvice { @@ -52,16 +56,7 @@ public class GlobalResponseHandler implements ResponseBodyAdvice { public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, Class> aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) { - ApiResponse apiResponse = ApiResponse.ofSuccess(o); - // 处理字符串时，遇到了类型转换的问题，debug一步一步跟踪，原来是对于字符串的ContentType是“text-plain”， - // ConverterType是StringHttpMessageConverter这个类型转换， - // 由于将结果封装成了自定义的ApiResponse类型，所以有ApiResponse转换成String报错 - // 所以需要对String类型的返回值单独进行处理 -// if (o instanceof String) { -// return JSONUtil.toJsonStr(apiResponse); -// } return ApiResponse.ofSuccess(o); -// return o; } private Boolean filter(MethodParameter methodParameter) { diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/UserInfoHelper.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/UserInfoHelper.java index 2746cea..96acd77 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/UserInfoHelper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/helper/UserInfoHelper.java @@ -1,7 +1,7 @@ package com.hz.pm.api.common.helper; import com.hz.pm.api.user.entity.UserInfo; -import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO; +import com.hz.pm.api.user.security.model.UserFullInfoDTO; import java.util.Collection; import java.util.List; 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 23ef5c8..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,10 +15,10 @@ 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.security.auth.model.UserFullInfoDTO; +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; import org.springframework.stereotype.Component; 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/DictUtils.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/DictUtils.java index 5874fb6..41c5262 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/DictUtils.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/DictUtils.java @@ -1,7 +1,7 @@ package com.hz.pm.api.common.util; import cn.hutool.core.collection.CollUtil; -import com.hz.pm.api.expert.model.DictionaryFieldInfo; +import com.hz.pm.api.expert.model.DictFieldInfoDTO; import java.util.Comparator; import java.util.List; @@ -15,7 +15,7 @@ public class DictUtils { private DictUtils() { } - public static Boolean isValueEquals(List list1, List list2) { + public static Boolean isValueEquals(List list1, List list2) { if (CollUtil.isEmpty(list1) && CollUtil.isEmpty(list2)) { return true; } @@ -27,8 +27,8 @@ public class DictUtils { if (list1.size() != list2.size()) { return false; } - list1.sort(Comparator.comparing(DictionaryFieldInfo::getDictionaryFieldName).thenComparing(DictionaryFieldInfo::getDictionaryCode)); - list2.sort(Comparator.comparing(DictionaryFieldInfo::getDictionaryFieldName).thenComparing(DictionaryFieldInfo::getDictionaryCode)); + list1.sort(Comparator.comparing(DictFieldInfoDTO::getDictionaryFieldName).thenComparing(DictFieldInfoDTO::getDictionaryCode)); + list2.sort(Comparator.comparing(DictFieldInfoDTO::getDictionaryFieldName).thenComparing(DictFieldInfoDTO::getDictionaryCode)); for (int i = 0; i < list1.size(); i++) { if (!StrUtils.trimEquals(list1.get(i).getDictionaryFieldName(), list2.get(i).getDictionaryFieldName()) 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/common/util/ExpertRegisterUtil.java b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExpertRegisterUtil.java index c609bc4..124150f 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExpertRegisterUtil.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/common/util/ExpertRegisterUtil.java @@ -15,7 +15,7 @@ import com.hz.pm.api.meta.constant.ExpertTagEnum; import com.hz.pm.api.meta.helper.DictionaryCache; import com.hz.pm.api.meta.helper.TagCache; import com.hz.pm.api.meta.model.ExpertRegionInfo; -import com.hz.pm.api.meta.model.dto.DictDTO; +import com.hz.pm.api.meta.model.dto.DictionaryDTO; import com.hz.pm.api.meta.model.dto.TagDTO; import com.hz.pm.api.organization.model.entity.DingOrganization; import com.hz.pm.api.organization.service.IDingOrganizationService; @@ -62,12 +62,12 @@ public class ExpertRegisterUtil { // 政治面貌 basic.setPolitical(new ArrayList<>()); String political = MapUtil.getStr(w, "政治面貌"); - List politicalDicts = dictionaryCache.listDictByDictType(DictTypeEnum.POLITICAL.getKey()); + List politicalDicts = dictionaryCache.listDictByDictType(DictTypeEnum.POLITICAL.getKey()); if (!politicalDicts.isEmpty()) { politicalDicts.stream() .filter(dict -> dict.getName().equals(political)) .findFirst().ifPresent(dictionary -> { - DictionaryFieldInfo dict = new DictionaryFieldInfo(); + DictFieldInfoDTO dict = new DictFieldInfoDTO(); dict.setDictionaryName(dictionary.getName()); dict.setDictionaryCode(dictionary.getDictionaryCode()); dict.setDictionaryFieldName(dictionary.getDictionaryType()); @@ -82,12 +82,12 @@ public class ExpertRegisterUtil { eduInfo.setDegree(new ArrayList<>()); // 学历 String eduStr = MapUtil.getStr(w, "学历"); - List eduDicts = dictionaryCache.listDictByDictType(DictTypeEnum.EDU.getKey()); + List eduDicts = dictionaryCache.listDictByDictType(DictTypeEnum.EDU.getKey()); if (!eduDicts.isEmpty()) { eduDicts.stream() .filter(dict -> dict.getName().equals(eduStr)) .findFirst().ifPresent(dictionary -> { - DictionaryFieldInfo dict = new DictionaryFieldInfo(); + DictFieldInfoDTO dict = new DictFieldInfoDTO(); dict.setDictionaryName(dictionary.getName()); dict.setDictionaryCode(dictionary.getDictionaryCode()); dict.setDictionaryFieldName(dictionary.getDictionaryType()); @@ -96,12 +96,12 @@ public class ExpertRegisterUtil { } // 学位 String degreeStr = MapUtil.getStr(w, "学位"); - List degreeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.DEGREE.getKey()); + List degreeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.DEGREE.getKey()); if (!degreeDicts.isEmpty()) { degreeDicts.stream() .filter(dict -> dict.getName().equals(degreeStr)) .findFirst().ifPresent(dictionary -> { - DictionaryFieldInfo dict = new DictionaryFieldInfo(); + DictFieldInfoDTO dict = new DictFieldInfoDTO(); dict.setDictionaryName(dictionary.getName()); dict.setDictionaryCode(dictionary.getDictionaryCode()); dict.setDictionaryFieldName(dictionary.getDictionaryType()); @@ -139,12 +139,12 @@ public class ExpertRegisterUtil { jobInfo.setAdministrativeDuties(MapUtil.getStr(w, "行政职务")); jobInfo.setAdministrativeRank(new ArrayList<>()); String administrativeRankStr = MapUtil.getStr(w, "行政职级"); - List administrativeRankDicts = dictionaryCache.listDictByDictType(DictTypeEnum.ADMINISTRATIVE_RANK.getKey()); + List administrativeRankDicts = dictionaryCache.listDictByDictType(DictTypeEnum.ADMINISTRATIVE_RANK.getKey()); if (!administrativeRankDicts.isEmpty()) { administrativeRankDicts.stream() .filter(dict -> dict.getName().equals(administrativeRankStr)) .findFirst().ifPresent(dictionary -> { - DictionaryFieldInfo dict = new DictionaryFieldInfo(); + DictFieldInfoDTO dict = new DictFieldInfoDTO(); dict.setDictionaryName(dictionary.getName()); dict.setDictionaryCode(dictionary.getDictionaryCode()); dict.setDictionaryFieldName(dictionary.getDictionaryType()); @@ -153,12 +153,12 @@ public class ExpertRegisterUtil { } jobInfo.setCompanyAttribute(new ArrayList<>()); String companyTypeStr = MapUtil.getStr(w, "*单位类型"); - List companyTypeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.COMPANY_ATTRIBUTE.getKey()); + List companyTypeDicts = dictionaryCache.listDictByDictType(DictTypeEnum.COMPANY_ATTRIBUTE.getKey()); if (!companyTypeDicts.isEmpty()) { companyTypeDicts.stream() .filter(dict -> dict.getName().equals(companyTypeStr)) .findFirst().ifPresent(dictionary -> { - DictionaryFieldInfo dict = new DictionaryFieldInfo(); + DictFieldInfoDTO dict = new DictFieldInfoDTO(); dict.setDictionaryName(dictionary.getName()); dict.setDictionaryCode(dictionary.getDictionaryCode()); dict.setDictionaryFieldName(dictionary.getDictionaryType()); @@ -170,7 +170,7 @@ public class ExpertRegisterUtil { professionalInfo.setAwards("暂无"); professionalInfo.setIndustrySector(new ArrayList<>()); professionalInfo.setOther(new ArrayList<>()); - Map tagMap = tagCache.getNameTagDtoMap(); + Map tagMap = tagCache.getNameTagMap(); String otherTagStr = MapUtil.getStr(w, "其他标签"); if (StrUtils.isNotBlank(otherTagStr)) { for (String othTag : otherTagStr.split(SEPARATOR)) { @@ -240,12 +240,12 @@ public class ExpertRegisterUtil { } professionalInfo.setTitleLevel(new ArrayList<>()); String titleLevel = MapUtil.getStr(w, "*职称级别"); - List titleLevelDicts = dictionaryCache.listDictByDictType(DictTypeEnum.TITLE_LEVEL.getKey()); + List titleLevelDicts = dictionaryCache.listDictByDictType(DictTypeEnum.TITLE_LEVEL.getKey()); if (!titleLevelDicts.isEmpty()) { titleLevelDicts.stream() .filter(dict -> dict.getName().equals(titleLevel)) .findFirst().ifPresent(dictionary -> { - DictionaryFieldInfo dict = new DictionaryFieldInfo(); + DictFieldInfoDTO dict = new DictFieldInfoDTO(); dict.setDictionaryName(dictionary.getName()); dict.setDictionaryCode(dictionary.getDictionaryCode()); dict.setDictionaryFieldName(dictionary.getDictionaryType()); 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 5c26fe3..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/DashboardExpertManage.java +++ /dev/null @@ -1,164 +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) - .eq(StringUtils.isNotBlank(queryRegionCode), Meeting::getRegionCode, queryRegionCode) - .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 5aa8f0d..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; @@ -17,7 +17,7 @@ import com.hz.pm.api.projectlib.service.IProjectService; import com.hz.pm.api.sys.model.entity.WflowEarlyWarningRecords; import com.hz.pm.api.sys.service.IEarlyWarningRecordsService; import com.hz.pm.api.sys.utils.EarlyWarningUtil; -import com.hz.pm.api.user.security.auth.model.UserInfoDetails; +import com.hz.pm.api.user.security.model.UserInfoDetails; import com.hz.pm.api.user.util.LoginUserUtil; import com.wflow.enums.WarningNoticeTypeEnum; import com.wflow.enums.WarningRuleTypeEnum; @@ -31,7 +31,6 @@ import org.flowable.task.api.Task; import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.math.RoundingMode; import java.time.LocalDateTime; import java.util.List; import java.util.Map; 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/dashboard/manage/MeetingStatisticsManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/MeetingStatisticsManage.java deleted file mode 100644 index e323b16..0000000 --- a/hz-pm-api/src/main/java/com/hz/pm/api/dashboard/manage/MeetingStatisticsManage.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.hz.pm.api.dashboard.manage; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.google.common.collect.Lists; -import com.hz.pm.api.common.constant.RegionConst; -import com.hz.pm.api.common.helper.RegionCacheHelper; -import com.hz.pm.api.common.model.entity.DataDTO; -import com.hz.pm.api.dashboard.model.vo.MeetingStatisticsVO; -import com.hz.pm.api.ding.constants.DingOrganizationContant; -import com.hz.pm.api.expert.constant.ReviewResultEnum; -import com.hz.pm.api.expert.model.entity.ExpertReview; -import com.hz.pm.api.expert.model.enumeration.ReviewTemplateTypeEnum; -import com.hz.pm.api.expert.service.IExpertReviewService; -import com.hz.pm.api.meeting.entity.domain.Meeting; -import com.hz.pm.api.meeting.service.IMeetingService; -import com.hz.pm.api.organization.model.entity.DingOrganization; -import com.hz.pm.api.organization.service.IDingOrganizationService; -import com.hz.pm.api.projectlib.model.entity.Project; -import com.hz.pm.api.projectlib.service.IProjectService; -import com.hz.pm.api.sys.model.dto.RegionDTO; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.Comparator; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @Classname MeetingStatisticsManage - * @Description - * @Date 2023/12/05 17:44 - * @Author PoffyZhang - */ -@Component -@RequiredArgsConstructor -@Slf4j -public class MeetingStatisticsManage { - - private final IMeetingService meetingService; - - private final IExpertReviewService expertReviewService; - - private final RegionCacheHelper regionCacheHelper; - - private final IDingOrganizationService dingOrganizationService; - - private final IProjectService projectService; - - public MeetingStatisticsVO statistics(Integer year) { - MeetingStatisticsVO res = new MeetingStatisticsVO(); - List meetings = meetingService.list(Wrappers.lambdaQuery(Meeting.class)); - //查出 年份的 会议数据 - meetings = meetings.stream().filter(m -> { - if(Objects.nonNull(m.getStartTime()) && - (Objects.isNull(year) || year.equals(m.getStartTime().getYear()))){ - return Boolean.TRUE; - } - return Boolean.FALSE; - }).collect(Collectors.toList()); - List meetingIds = meetings.stream().map(Meeting::getId) - .collect(Collectors.toList()); - - //会议总数 - res.setMeetingTotal(meetings.size()); - - //评审数 - List expertReviews = Lists.newArrayList(); - Integer reviewsTotal = 0; - if(CollUtil.isNotEmpty(meetingIds)){ - expertReviews = expertReviewService.list(Wrappers.lambdaQuery(ExpertReview.class) - .eq(ExpertReview::getIsFinal, Boolean.TRUE) - .in(ExpertReview::getMeetingId,meetingIds)); - reviewsTotal = expertReviews.size(); - } - //通过的评审 - List passExpertReviews = expertReviews.stream() - .filter(r -> Objects.nonNull(r.getReviewResult()) && - r.getReviewResult().equals(ReviewResultEnum.PASSED.getCode())) - .collect(Collectors.toList()); - //不通过的评审 - List notpassExpertReviews = expertReviews.stream() - .filter(r -> Objects.nonNull(r.getReviewResult()) && - r.getReviewResult().equals(ReviewResultEnum.REFUSED.getCode())) - .collect(Collectors.toList()); - res.setPassReview(passExpertReviews.size()); - res.setNotPassRate(reviewsTotal.compareTo(0) == 0 ? BigDecimal.ZERO : - BigDecimal.valueOf(notpassExpertReviews.size()).multiply(BigDecimal.valueOf(100) - .divide(BigDecimal.valueOf(reviewsTotal), RoundingMode.HALF_UP))); - - //各区域 - List regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY) - .stream().filter(r -> r.getRegionLevel().equals(RegionConst.RL_COUNTY)) - .sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); - List regionMeetngs = Lists.newArrayList(); - for(RegionDTO region : regions){ - regionMeetngs.add(DataDTO.of(region.getRegionName(),region.getRegionCode(),meetings.stream().filter(m -> { - if(StringUtils.isNotBlank(m.getRegionCode()) && - m.getRegionCode().equals(region.getRegionCode())){ - return Boolean.TRUE; - } - return Boolean.FALSE; - }).collect(Collectors.toList()).size())); - } - res.setRegionMeetings(regionMeetngs); - - //预审 验收 会议 - List meetingTypes = Lists.newArrayList(); - meetingTypes.add(DataDTO.of("预审会议",ReviewTemplateTypeEnum.PRELIMINARY_SCHEME_REVIEW.getCode().toString(), - meetings.stream().filter(m -> { - if(StringUtils.isNotBlank(m.getType()) && - m.getType().equals(ReviewTemplateTypeEnum.PRELIMINARY_SCHEME_REVIEW.getCode() - .toString())){ - return Boolean.TRUE; - } - return Boolean.FALSE; - }).collect(Collectors.toList()).size())); - Long yanshouCount = meetings.stream().filter(m -> { - if (StringUtils.isNotBlank(m.getType()) && - m.getType().equals(ReviewTemplateTypeEnum.ACCEPTANCE_SCHEME_REVIEW.getCode() - .toString())) { - return Boolean.TRUE; - } - return Boolean.FALSE; - }).count(); - meetingTypes.add(DataDTO.of("验收会议",ReviewTemplateTypeEnum.ACCEPTANCE_SCHEME_REVIEW.getCode().toString(), - yanshouCount.intValue())); - res.setMeetingTypes(meetingTypes); - - //各区县评审 不通过率 - List regionNotpassReview = Lists.newArrayList(); - for(RegionDTO region : regions){ - DataDTO data = new DataDTO(); - data.setCode(region.getRegionCode()); - data.setName(region.getRegionName()); - //先求出 此区域会议 - List regionMeetingIds = meetings.stream().filter(m -> { - if (StringUtils.isNotBlank(m.getRegionCode()) && - m.getRegionCode().equals(region.getRegionCode())) { - return Boolean.TRUE; - } - return Boolean.FALSE; - }).map(Meeting::getId).collect(Collectors.toList()); - - List regionReviews = expertReviews.stream().filter(r -> { - if (Objects.nonNull(r.getMeetingId()) && - regionMeetingIds.contains(r.getMeetingId())) { - return Boolean.TRUE; - } - return Boolean.FALSE; - }).collect(Collectors.toList()); - long regionNotpass = regionReviews.stream().filter(r -> Objects.nonNull(r.getReviewResult()) && - r.getReviewResult().equals(ReviewResultEnum.REFUSED.getCode())) - .count(); - - data.setRate(CollUtil.isEmpty(regionReviews) ? BigDecimal.ZERO : - BigDecimal.valueOf(regionNotpass).multiply(BigDecimal.valueOf(100)) - .divide(BigDecimal.valueOf(regionReviews.size()),BigDecimal.ROUND_CEILING,RoundingMode.HALF_UP)); - - regionNotpassReview.add(data); - } - res.setNotPassRegionMeetings(regionNotpassReview); - - //各部门 不通过项目TOP10 - List organizations = dingOrganizationService.list(Wrappers.lambdaQuery(DingOrganization.class) - .in(DingOrganization::getTypeCode, Lists.newArrayList(DingOrganizationContant.UNIT_TYPE, - DingOrganizationContant.GOV_TEMPORARY))); - List projects = projectService.list(Wrappers.lambdaQuery(Project.class) - .eq(Project::getNewest, Boolean.TRUE)); - - //TOP10 - List finalExpertReviews = expertReviews; - List notpassTop10 = organizations.stream() - .map(o -> { - DataDTO data = new DataDTO(); - data.setCode(o.getOrganizationCode()); - data.setName(o.getOrganizationName()); - List orgProjects = projects.stream().filter(p -> Objects.nonNull(p.getBuildOrgCode()) && - p.getBuildOrgCode().equals(o.getOrganizationCode())) - .collect(Collectors.toList()); - List projectCodes = orgProjects.stream().map(Project::getProjectCode) - .collect(Collectors.toList()); - if(CollUtil.isEmpty(projectCodes)){ - data.setRate(BigDecimal.ZERO); - return data; - } - List reviews = finalExpertReviews.stream().filter(r -> Objects.nonNull(r.getProjectCode()) && - projectCodes.contains(r.getProjectCode())).collect(Collectors.toList()); - long orgNotpass = reviews.stream().filter(r -> Objects.nonNull(r.getReviewResult()) && - r.getReviewResult().equals(ReviewResultEnum.REFUSED.getCode())) - .count(); - data.setRate(CollUtil.isEmpty(reviews) ? BigDecimal.ZERO : - BigDecimal.valueOf(orgNotpass).multiply(BigDecimal.valueOf(100)) - .divide(BigDecimal.valueOf(reviews.size()),BigDecimal.ROUND_CEILING,RoundingMode.HALF_UP)); - return data; - }) - .sorted(Comparator.comparing(DataDTO::getRate).reversed()) - .limit(10).collect(Collectors.toList()); - res.setNotPassTop10(notpassTop10); - return res; - } -} 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 41dbe97..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,8 +4,8 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; 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 fc841dd..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,9 +6,9 @@ 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.security.auth.model.UserFullInfoDTO; -import com.hz.pm.api.user.security.auth.model.UserInfoDetails; +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; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; 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 f48d28e..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,12 +1,12 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; 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 2164383..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,13 +2,13 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; 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 10e44f1..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,8 +4,8 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; 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 5ae717f..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,8 +3,8 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; 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 db86b0b..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,13 +2,13 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; 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 26c7e74..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,12 +1,12 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; 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 87c3c49..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,8 +3,8 @@ 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.security.auth.model.UserFullInfoDTO; +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; import lombok.extern.slf4j.Slf4j; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/utils/DataScopeUtil.java b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/utils/DataScopeUtil.java index 6c063ac..ac73970 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/datascope/utils/DataScopeUtil.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/datascope/utils/DataScopeUtil.java @@ -2,8 +2,8 @@ package com.hz.pm.api.datascope.utils; import com.hz.pm.api.datascope.model.DataScopeDTO; import com.hz.pm.api.datascope.provider.DataScopeContext; -import com.hz.pm.api.user.security.auth.model.UserFullInfoDTO; -import com.hz.pm.api.user.security.auth.model.UserInfoDetails; +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; import java.util.Objects; 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/DictAssembler.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/DictAssembler.java index 61752dc..c498e3e 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/DictAssembler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/DictAssembler.java @@ -1,10 +1,10 @@ package com.hz.pm.api.expert.assembler; import cn.hutool.core.collection.CollUtil; -import com.hz.pm.api.expert.model.DictionaryFieldInfo; +import com.hz.pm.api.expert.model.DictFieldInfoDTO; import com.hz.pm.api.meta.model.entity.ExpertDictionary; -import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -17,12 +17,12 @@ public class DictAssembler { private DictAssembler() { } - public static List toDictFieldInfoList(List expertDictList) { + public static List convert(List expertDictList) { if (CollUtil.isEmpty(expertDictList)) { - return new ArrayList<>(); + return Collections.emptyList(); } return expertDictList.stream().map(r -> { - DictionaryFieldInfo dictionaryFieldInfo = new DictionaryFieldInfo(); + DictFieldInfoDTO dictionaryFieldInfo = new DictFieldInfoDTO(); dictionaryFieldInfo.setDictionaryFieldName(r.getExpertInfoField()); dictionaryFieldInfo.setDictionaryCode(r.getDictionaryCode()); return dictionaryFieldInfo; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertAdminExpertManageAssembler.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertAdminExpertManageAssembler.java index 872ea48..bac253a 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertAdminExpertManageAssembler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertAdminExpertManageAssembler.java @@ -1,22 +1,17 @@ package com.hz.pm.api.expert.assembler; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.hz.pm.api.common.helper.RegionCacheHelper; -import com.hz.pm.api.expert.constant.ExpertAccountStatusEnum; -import com.hz.pm.api.expert.constant.QueryExpertAccountStatusEnum; -import com.hz.pm.api.expert.model.DictionaryFieldInfo; +import com.hz.pm.api.expert.model.DictFieldInfoDTO; import com.hz.pm.api.expert.model.TagFieldInfo; -import com.hz.pm.api.expert.model.dto.ExpertAdminExpertManageListDTO; +import com.hz.pm.api.expert.model.dto.ExpertAdminExpertListDTO; import com.hz.pm.api.expert.model.vo.ExpertLibraryListItemVO; import com.hz.pm.api.meta.helper.DictionaryCache; import com.hz.pm.api.meta.helper.impl.TagsCacheImpl; -import com.hz.pm.api.meta.model.ExpertRegionInfo; -import com.hz.pm.api.meta.model.dto.DictDTO; +import com.hz.pm.api.meta.model.dto.DictionaryDTO; import com.hz.pm.api.meta.model.dto.TagDTO; -import com.hz.pm.api.sys.model.dto.RegionDTO; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import java.util.*; @@ -31,96 +26,38 @@ import java.util.stream.Collectors; public class ExpertAdminExpertManageAssembler { private final DictionaryCache dictionaryCache; - private final TagsCacheImpl tagCache; - private final RegionCacheHelper regionCache; - public List toExpertAdminExpertManageListVOList( - List expertManageListDTOList) { - if (CollectionUtil.isEmpty(expertManageListDTOList)) { - return new ArrayList<>(); + public List toViews( + List experts) { + if (CollUtil.isEmpty(experts)) { + return Collections.emptyList(); } - return expertManageListDTOList.stream().map(r -> { - ExpertLibraryListItemVO expertLibraryListItemVO = new ExpertLibraryListItemVO(); - expertLibraryListItemVO.setUserId(r.getUserId()); - expertLibraryListItemVO.setExpertName(r.getExpertName()); - expertLibraryListItemVO.setPhoneNo(r.getPhoneNo()); - expertLibraryListItemVO.setIsDingUser(r.getIsDingUser()); - expertLibraryListItemVO.setCompany(r.getCompany()); - expertLibraryListItemVO.setLegalEntityCode(r.getLegalEntityCode()); - - if (StringUtils.isNotBlank(r.getExpertAccountStatus())) { - ExpertAccountStatusEnum statusEnum = ExpertAccountStatusEnum.of(r.getExpertAccountStatus()); - switch (statusEnum) { - case FREEZE: - expertLibraryListItemVO.setExpertAccountStatus(QueryExpertAccountStatusEnum.FREEZING.getKey()); - break; - case AVAILABLE: - expertLibraryListItemVO.setExpertAccountStatus(QueryExpertAccountStatusEnum.NORMAL.getKey()); - break; - default: - break; - } - } - ExpertRegionInfo expertRegionInfo = r.getExpertRegionInfo(); - if (Objects.nonNull(expertRegionInfo)) { - Integer regionLevel = expertRegionInfo.getRegionLevel(); - String regionCode = expertRegionInfo.getRegionCode(); - RegionDTO regionDTO = regionCache.getByCodeAndLevel(regionCode, regionLevel); - if (Objects.nonNull(regionDTO)) { - expertRegionInfo.setRegionCode(regionDTO.getRegionCode()); - expertRegionInfo.setRegionLevel(regionDTO.getRegionLevel()); - expertRegionInfo.setRegionName(regionDTO.getRegionName()); - expertLibraryListItemVO.setExpertRegionInfo(expertRegionInfo); - } - } - List expertType = r.getExpertType(); - if (CollectionUtils.isNotEmpty(expertType)) { - expertType = assembleDictionaryName(expertType); - expertLibraryListItemVO.setExpertType(expertType); - } - List companyAttribute = r.getCompanyAttribute(); - if (CollectionUtils.isNotEmpty(companyAttribute)) { - companyAttribute = assembleDictionaryName(companyAttribute); - expertLibraryListItemVO.setCompanyAttribute(companyAttribute); - } - List titleLevel = r.getTitleLevel(); - if (CollectionUtils.isNotEmpty(titleLevel)) { - titleLevel = assembleDictionaryName(titleLevel); - expertLibraryListItemVO.setTitleLevel(titleLevel); - } - - List expertSource = r.getExpertSource(); - if (CollectionUtils.isNotEmpty(expertSource)) { - expertSource = assembleTagName(expertSource); - expertLibraryListItemVO.setExpertSource(expertSource); - } - expertLibraryListItemVO.setCreateTime(r.getCreateTime()); - return expertLibraryListItemVO; + return experts.stream().map(r -> { + ExpertLibraryListItemVO item = new ExpertLibraryListItemVO(); + item.setUserId(r.getUserId()); + item.setExpertName(r.getExpertName()); + item.setPhoneNo(r.getPhoneNo()); + item.setCompany(r.getCompany()); + item.setExpertType(fillDictName(r.getExpertType())); + item.setExpertSource(fillDictName(r.getExpertSource())); + item.setExpertLibrary(fillDictName(r.getExpertLibrary())); + item.setExpertSpecialty(fillDictName(r.getExpertSpecialty())); + item.setInPutTime(r.getInPutTime()); + item.setCreateTime(r.getCreateTime()); + return item; }).collect(Collectors.toList()); } - public List assembleDictionaryName(List collect) { - if (CollectionUtil.isEmpty(collect)){ - return Collections.emptyList(); + private List fillDictName(List dicts) { + if (CollectionUtil.isEmpty(dicts)) { + return dicts; } - return collect.stream().peek(r -> { - Optional dict = dictionaryCache.getByCode(r.getDictionaryCode()); + dicts.forEach(r -> { + Optional dict = dictionaryCache.getByCode(r.getDictionaryCode()); dict.ifPresent(dictDTO -> r.setDictionaryName(dictDTO.getName())); - }).collect(Collectors.toList()); - } - - - public List assembleTagName(List collect) { - if (CollectionUtil.isEmpty(collect)){ - return new ArrayList<>(); - } - return collect.stream().peek(r -> { - TagDTO tagDTO = tagCache.getByTagCode(r.getTagCode()); - if (Objects.nonNull(tagDTO)) { - r.setTagName(tagDTO.getTagName()); - } - }).collect(Collectors.toList()); + }); + return dicts; } } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertInfoCmdAssembler.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertInfoCmdAssembler.java index e42f6e4..1546504 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertInfoCmdAssembler.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/assembler/ExpertInfoCmdAssembler.java @@ -119,20 +119,20 @@ public class ExpertInfoCmdAssembler { private static List buildExpertDictionaryList(ExpertBasicInfo basicInfo, ExpertEduInfo eduInfo , ExpertJobInfo jobInfo, ExpertProfessionalInfo professionalInfo, ExpertRecommendInfo recommendInfo) { - List political = basicInfo.getPolitical(); - List expertType = basicInfo.getExpertType(); - List edu = eduInfo.getEdu(); - List degree = eduInfo.getDegree(); - List jobStatus = jobInfo.getJobStatus(); - List companyAttribute = jobInfo.getCompanyAttribute(); - List administrativeRank = jobInfo.getAdministrativeRank(); - List titleLevel = professionalInfo.getTitleLevel(); - - List recommendedWay = new ArrayList<>(); + List political = basicInfo.getPolitical(); + List expertType = basicInfo.getExpertType(); + List edu = eduInfo.getEdu(); + List degree = eduInfo.getDegree(); + List jobStatus = jobInfo.getJobStatus(); + List companyAttribute = jobInfo.getCompanyAttribute(); + List administrativeRank = jobInfo.getAdministrativeRank(); + List titleLevel = professionalInfo.getTitleLevel(); + + List recommendedWay = new ArrayList<>(); if (Objects.nonNull(recommendInfo)) { recommendedWay = recommendInfo.getRecommendedWay(); } - List dictionaryFieldInfoList = new ArrayList<>(); + List dictionaryFieldInfoList = new ArrayList<>(); assemblerDictionaryFieldName(dictionaryFieldInfoList, political, ExpertDictTypeEnum.POLITICAL); assemblerDictionaryFieldName(dictionaryFieldInfoList, expertType, ExpertDictTypeEnum.EXPERT_TYPE); assemblerDictionaryFieldName(dictionaryFieldInfoList, edu, ExpertDictTypeEnum.EDU); @@ -152,7 +152,7 @@ public class ExpertInfoCmdAssembler { } private static void assemblerDictionaryFieldName( - List allDictionaryFieldInfoList, List originalDictionaryFieldInfoList + List allDictionaryFieldInfoList, List originalDictionaryFieldInfoList , ExpertDictTypeEnum dictExpertInfoTypeEnum) { if (CollectionUtils.isNotEmpty(originalDictionaryFieldInfoList)) { originalDictionaryFieldInfoList = originalDictionaryFieldInfoList.stream().map(r -> { 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 646b2a4..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 @@ -3,7 +3,6 @@ package com.hz.pm.api.expert.assembler; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.hz.pm.api.common.helper.RegionCacheHelper; import com.hz.pm.api.common.model.FileBasicInfo; import com.hz.pm.api.expert.constant.ExpertApplyTypeEnum; @@ -17,10 +16,11 @@ import com.hz.pm.api.meta.constant.ExpertTagEnum; import com.hz.pm.api.meta.helper.DictionaryCache; import com.hz.pm.api.meta.helper.TagCache; import com.hz.pm.api.meta.model.ExpertRegionInfo; -import com.hz.pm.api.meta.model.dto.DictDTO; +import com.hz.pm.api.meta.model.dto.DictionaryDTO; import com.hz.pm.api.meta.model.dto.TagDTO; import com.hz.pm.api.meta.model.entity.ExpertDictionary; import com.hz.pm.api.meta.model.entity.ExpertTag; +import com.ningdatech.basic.util.CollUtils; import com.ningdatech.file.entity.vo.result.AttachFileVo; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; @@ -45,7 +45,7 @@ public class ExpertUserInfoAssembler { public ExpertFullInfoVO buildExpertDetail(List attachFiles, ExpertFullInfoAllDTO expertFullInfoAll) { ExpertUserFullInfoDTO expertUserInfo = expertFullInfoAll.getExpertUserInfoDTO(); // 字典字典段map - Map> dictMap = buildDictInfoMap(expertFullInfoAll.getExpertDictionaryList()); + Map> dictMap = buildDictInfoMap(expertFullInfoAll.getExpertDictionaryList()); // 专家文件资料map Map fileMap = buildFileBasicInfoMap(attachFiles); // 专家标签字段map @@ -118,19 +118,19 @@ public class ExpertUserInfoAssembler { }).collect(Collectors.groupingBy(TagFieldInfo::getTagFieldName)); } - public Map> buildDictInfoMap(List expertDictList) { + public Map> buildDictInfoMap(List expertDictList) { return expertDictList.stream().map(r -> { - DictionaryFieldInfo dictionaryFieldInfo = new DictionaryFieldInfo(); + DictFieldInfoDTO dictionaryFieldInfo = new DictFieldInfoDTO(); dictionaryFieldInfo.setDictionaryFieldName(r.getExpertInfoField()); dictionaryFieldInfo.setDictionaryCode(r.getDictionaryCode()); - Optional dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode()); + Optional dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode()); dictionaryDTO.ifPresent(dictDTO -> dictionaryFieldInfo.setDictionaryName(dictDTO.getName())); return dictionaryFieldInfo; - }).collect(Collectors.groupingBy(DictionaryFieldInfo::getDictionaryFieldName)); + }).collect(Collectors.groupingBy(DictFieldInfoDTO::getDictionaryFieldName)); } public static ExpertProfessionalInfo buildExpertProfessionalInfo(ExpertUserFullInfoDTO expertUserInfoDTO, - Map> dictInfoMap, + Map> dictInfoMap, Map> tagFieldInfoMap, Map fileInfoMap, List expertAvoidCompanyList) { @@ -151,7 +151,7 @@ public class ExpertUserInfoAssembler { } public static ExpertJobInfo buildExpertJobInfo(ExpertUserFullInfoDTO expertUserInfoDTO, - Map> dictInfoMap) { + Map> dictInfoMap) { ExpertJobInfo jobInfo = new ExpertJobInfo(); jobInfo.setJobStatus(dictInfoMap.get(ExpertDictTypeEnum.JOB_STATUS.getKey())); jobInfo.setCompany(expertUserInfoDTO.getCompany()); @@ -166,7 +166,7 @@ public class ExpertUserInfoAssembler { } public static ExpertEduInfo buildExpertEduInfo(ExpertUserFullInfoDTO expertFullInfo, - Map> dictInfoMap) { + Map> dictInfoMap) { // 学历信息 ExpertEduInfo eduInfo = new ExpertEduInfo(); eduInfo.setSchool(expertFullInfo.getSchoolMajor()); @@ -194,7 +194,7 @@ public class ExpertUserInfoAssembler { } public ExpertBasicInfo convert(ExpertUserFullInfoDTO expertUserInfoDTO - , Map> dictionaryFieldInfoMap + , Map> dictionaryFieldInfoMap , Map> tagFieldInfoMap , List expertIntentionWorkRegionInfo) { //专家层级 @@ -363,59 +363,32 @@ 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; } - public static ExpertAdminExpertManageListDTO convert(ExpertUserFullInfo expertUserFullInfo, - Map> expertDictMap, - Map> expertTagMap) { - Long userId = expertUserFullInfo.getUserId(); - ExpertAdminExpertManageListDTO adminManageExpertListItem = new ExpertAdminExpertManageListDTO(); - adminManageExpertListItem.setUserId(expertUserFullInfo.getUserId()); - adminManageExpertListItem.setExpertName(expertUserFullInfo.getExpertName()); - adminManageExpertListItem.setPhoneNo(expertUserFullInfo.getPhoneNo()); - adminManageExpertListItem.setIsDingUser(expertUserFullInfo.getIsDingUser()); - adminManageExpertListItem.setCompany(expertUserFullInfo.getCompany()); + public static ExpertAdminExpertListDTO convert(ExpertUserFullInfo eui, + Map> expertDictMap) { + ExpertAdminExpertListDTO item = new ExpertAdminExpertListDTO(); + item.setUserId(eui.getUserId()); + item.setExpertName(eui.getExpertName()); + item.setPhoneNo(eui.getPhoneNo()); + item.setCompany(eui.getCompany()); + Long userId = eui.getUserId(); // 装配字典数据 - List userExpertDictList = expertDictMap.getOrDefault(userId, Collections.emptyList()); - Map> fieldExpertDictMap = userExpertDictList.stream().collect(Collectors.groupingBy(ExpertDictionary::getExpertInfoField)); - adminManageExpertListItem.setExpertType( - DictAssembler.toDictFieldInfoList(fieldExpertDictMap.get(ExpertDictTypeEnum.EXPERT_TYPE.getKey()))); - adminManageExpertListItem.setCompanyAttribute( - DictAssembler.toDictFieldInfoList(fieldExpertDictMap.get(ExpertDictTypeEnum.COMPANY_ATTRIBUTE.getKey()))); - adminManageExpertListItem.setTitleLevel( - DictAssembler.toDictFieldInfoList(fieldExpertDictMap.get(ExpertDictTypeEnum.TITLE_LEVEL.getKey()))); - // 装配标签数据 - List expertTagList = Objects.isNull(expertTagMap.get(userId)) ? new ArrayList<>() : expertTagMap.get(userId); - Map> fieldExpertTagMap = expertTagList.stream().collect(Collectors.groupingBy(ExpertTag::getExpertInfoField)); - adminManageExpertListItem.setExpertSource(TagAssembler.toTagFieldInfoList(fieldExpertTagMap.get(ExpertTagEnum.EXPERT_SOURCE.getKey()))); - - if (StrUtil.isNotBlank(expertUserFullInfo.getRegionCode()) && Objects.nonNull(expertUserFullInfo.getRegionLevel())) { - ExpertRegionInfo expertRegionInfo = new ExpertRegionInfo(); - expertRegionInfo.setRegionLevel(expertUserFullInfo.getRegionLevel()); - expertRegionInfo.setRegionCode(expertUserFullInfo.getRegionCode()); - adminManageExpertListItem.setExpertRegionInfo(expertRegionInfo); + List currUserDicts = expertDictMap.get(userId); + if (CollUtil.isNotEmpty(currUserDicts)) { + Map> currDictMap = CollUtils.group(currUserDicts, ExpertDictionary::getExpertInfoField); + item.setExpertType(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_TYPE.getKey()))); + item.setExpertSpecialty(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_SPECIALTY.getKey()))); + item.setExpertSource(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_SOURCE.getKey()))); + item.setExpertLibrary(DictAssembler.convert(currDictMap.get(ExpertDictTypeEnum.EXPERT_LIBRARY.getKey()))); } - // 以下数据为专家excel导出使用 - adminManageExpertListItem.setGender(expertUserFullInfo.getGender()); - adminManageExpertListItem.setBirthday(expertUserFullInfo.getBirthday()); - adminManageExpertListItem.setHometown(expertUserFullInfo.getHometown()); - adminManageExpertListItem.setNationality(expertUserFullInfo.getNationality()); - adminManageExpertListItem.setPolitical( - DictAssembler.toDictFieldInfoList(fieldExpertDictMap.get(ExpertDictTypeEnum.POLITICAL.getKey()))); - adminManageExpertListItem.setIdCard(expertUserFullInfo.getIdCard()); - adminManageExpertListItem.setBankNo(expertUserFullInfo.getBankNo()); - adminManageExpertListItem.setEdu( - DictAssembler.toDictFieldInfoList(fieldExpertDictMap.get(ExpertDictTypeEnum.EDU.getKey()))); - adminManageExpertListItem.setRecommendedWay( - DictAssembler.toDictFieldInfoList(fieldExpertDictMap.get(ExpertDictTypeEnum.RECOMMENDED_WAY.getKey()))); - - adminManageExpertListItem.setCreateTime(expertUserFullInfo.getCreateOn()); - return adminManageExpertListItem; + item.setGender(eui.getGender()); + item.setInPutTime(eui.getInPutTime()); + item.setCreateTime(eui.getCreateOn()); + return item; } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/constant/ExpertUserInfoSensitiveFieldEnum.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/constant/ExpertUserInfoSensitiveFieldEnum.java index d6a01c9..ea367be 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/constant/ExpertUserInfoSensitiveFieldEnum.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/constant/ExpertUserInfoSensitiveFieldEnum.java @@ -1,7 +1,7 @@ package com.hz.pm.api.expert.constant; -import com.hz.pm.api.expert.model.DictionaryFieldInfo; +import com.hz.pm.api.expert.model.DictFieldInfoDTO; import com.hz.pm.api.expert.model.TagFieldInfo; import com.hz.pm.api.meta.model.ExpertRegionInfo; import lombok.AllArgsConstructor; @@ -33,9 +33,9 @@ public enum ExpertUserInfoSensitiveFieldEnum { company_uniq_code("company_uniq_code", "工作单位编码", String.class, UnitType.single), legal_entity_code("legal_entity_code", "单位法人编号", String.class, UnitType.single), // 行政职级 - administrative_rank("administrative_rank", "行政职级", DictionaryFieldInfo.class, UnitType.list), + administrative_rank("administrative_rank", "行政职级", DictFieldInfoDTO.class, UnitType.list), // 职称级别 - title_level("title_level", "职称级别", DictionaryFieldInfo.class, UnitType.list), + title_level("title_level", "职称级别", DictFieldInfoDTO.class, UnitType.list), // 擅长方向 good_at("good_at", "擅长方向", TagFieldInfo.class, UnitType.list), // 技术专长 diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/controller/ExpertController.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/controller/ExpertController.java index 87285ec..453f877 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/controller/ExpertController.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/controller/ExpertController.java @@ -69,13 +69,13 @@ public class ExpertController { @GetMapping("/detail") @ApiOperation("专家获取专家详细信息") public ExpertDetailVO getExpertDetail() { - return expertManage.getExpertDetail(LoginUserUtil.getUserId()); + return expertManage.getExpertDetail(LoginUserUtil.getUserId(), true); } @GetMapping("/admin/detail") @ApiOperation("专家管理员获取专家详细信息") public ExpertDetailVO getExpertDetail(@RequestParam(value = "expertUserId") @NotNull Long userId) { - return expertManage.getExpertDetail(userId); + return expertManage.getExpertDetail(userId, true); } @PostMapping("/expert-library/list") 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 549b95e..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 @@ -1,9 +1,6 @@ package com.hz.pm.api.expert.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,8 +27,10 @@ public class ExpertUserFullInfo implements Serializable { @TableId(type = IdType.AUTO) private Long id; + @TableField(fill = FieldFill.INSERT) private LocalDateTime createOn; + @TableField(fill = FieldFill.INSERT_UPDATE) private LocalDateTime updateOn; /** @@ -44,6 +43,8 @@ public class ExpertUserFullInfo implements Serializable { */ private String mhUserId; + private String mhExpertId; + /** * 专家编号 */ @@ -93,10 +94,6 @@ public class ExpertUserFullInfo implements Serializable { private String email; - private String regionCode; - - private Integer regionLevel; - /** * 企业ID */ @@ -237,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/ExpertInfoSensitiveFieldModifyCheckHelper.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/ExpertInfoSensitiveFieldModifyCheckHelper.java index c374285..b09c194 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/ExpertInfoSensitiveFieldModifyCheckHelper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/ExpertInfoSensitiveFieldModifyCheckHelper.java @@ -52,7 +52,7 @@ public class ExpertInfoSensitiveFieldModifyCheckHelper { ExpertUserFullInfoDTO expertUserInfoDTO = expertUserFullInfoAll.getExpertUserInfoDTO(); // 字典字典段map - Map> dictionaryFieldInfoMap = + Map> dictionaryFieldInfoMap = expertUserInfoAssembler.buildDictInfoMap(expertUserFullInfoAll.getExpertDictionaryList()); // 专家文件资料map Map fileBasicInfoMap = ExpertUserInfoAssembler.buildFileBasicInfoMap(attachFiles); @@ -148,7 +148,7 @@ public class ExpertInfoSensitiveFieldModifyCheckHelper { } - private List assemblerDictionaryFieldInfoList(List dictionaryFieldInfoList, String fieldName) { + private List assemblerDictionaryFieldInfoList(List dictionaryFieldInfoList, String fieldName) { if (CollUtil.isNotEmpty(dictionaryFieldInfoList)) { dictionaryFieldInfoList.forEach(r -> r.setDictionaryFieldName(fieldName)); } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/ExpertManageHelper.java b/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/ExpertManageHelper.java index 4b68048..6b035ed 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/ExpertManageHelper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/expert/helper/ExpertManageHelper.java @@ -4,8 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.hz.pm.api.expert.model.*; import com.hz.pm.api.meta.helper.DictionaryCache; import com.hz.pm.api.meta.helper.TagCache; -import com.hz.pm.api.meta.model.ExpertRegionInfo; -import com.hz.pm.api.meta.model.dto.DictDTO; +import com.hz.pm.api.meta.model.dto.DictionaryDTO; import com.hz.pm.api.meta.model.dto.TagDTO; import com.ningdatech.basic.exception.BizException; import lombok.RequiredArgsConstructor; @@ -65,14 +64,14 @@ public class ExpertManageHelper { * @param jobInfo \ */ public void dictionaryFieldCheck(ExpertBasicInfo basicInfo, ExpertEduInfo eduInfo, ExpertJobInfo jobInfo) { - List political = basicInfo.getPolitical(); - List edu = eduInfo.getEdu(); - List degree = eduInfo.getDegree(); - List jobStatus = jobInfo.getJobStatus(); - List companyAttribute = jobInfo.getCompanyAttribute(); - List administrativeRank = jobInfo.getAdministrativeRank(); + List political = basicInfo.getPolitical(); + List edu = eduInfo.getEdu(); + List degree = eduInfo.getDegree(); + List jobStatus = jobInfo.getJobStatus(); + List companyAttribute = jobInfo.getCompanyAttribute(); + List administrativeRank = jobInfo.getAdministrativeRank(); - List dictFieldList = new ArrayList<>(); + List dictFieldList = new ArrayList<>(); dictFieldList.addAll(political); dictFieldList.addAll(edu); dictFieldList.addAll(degree); @@ -80,9 +79,9 @@ public class ExpertManageHelper { dictFieldList.addAll(companyAttribute); dictFieldList.addAll(administrativeRank); - for (DictionaryFieldInfo dictField : dictFieldList) { + for (DictFieldInfoDTO dictField : dictFieldList) { String dictCode = dictField.getDictionaryCode(); - Optional dict = dictionaryCache.getByCode(dictCode); + Optional dict = dictionaryCache.getByCode(dictCode); if (!dict.isPresent()) { String dictFieldName = dictField.getDictionaryFieldName(); throw BizException.wrap("字典数据无效：%s=%s", dictFieldName, dictCode); 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 2a4f7c5..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,7 +1,7 @@ package com.hz.pm.api.expert.helper; -import com.hz.pm.api.user.entity.enumeration.RoleEnum; -import com.hz.pm.api.user.security.auth.model.UserInfoDetails; +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; import org.springframework.stereotype.Component; 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 fc300db..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 @@ -23,9 +23,8 @@ import com.hz.pm.api.expert.model.*; import com.hz.pm.api.expert.model.bo.ExpertInfoSensitiveFieldCheckBO; 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.ExpertAdminExpertManageListDTO; +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.toExpertAdminExpertManageListVOList(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 aee709b..4926715 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 @@ -1,14 +1,19 @@ package com.hz.pm.api.expert.manage; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; 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.common.util.BizUtils; import com.hz.pm.api.expert.assembler.ExpertInfoCmdAssembler; import com.hz.pm.api.expert.entity.ExpertUserFullInfo; import com.hz.pm.api.expert.helper.ExpertManageHelper; -import com.hz.pm.api.expert.model.*; +import com.hz.pm.api.expert.model.ExpertBasicInfo; +import com.hz.pm.api.expert.model.ExpertEduInfo; +import com.hz.pm.api.expert.model.ExpertJobInfo; +import com.hz.pm.api.expert.model.ExpertProfessionalInfo; import com.hz.pm.api.expert.model.cmd.ExpertFullInfoSaveCmd; import com.hz.pm.api.expert.model.dto.DictionaryVO; import com.hz.pm.api.expert.model.req.ExpertRegistrationRequest; @@ -17,6 +22,10 @@ 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.external.MhFileClient; +import com.hz.pm.api.external.model.dto.MhFileInfoDTO; +import com.hz.pm.api.external.model.vo.MhFileInfoVO; 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; @@ -26,7 +35,7 @@ import com.hz.pm.api.meeting.service.IMeetingExpertJudgeService; import com.hz.pm.api.meeting.service.IMeetingExpertService; import com.hz.pm.api.meta.constant.ExpertDictTypeEnum; import com.hz.pm.api.meta.helper.DictionaryCache; -import com.hz.pm.api.meta.model.dto.DictDTO; +import com.hz.pm.api.meta.model.dto.DictionaryDTO; import com.hz.pm.api.meta.model.entity.ExpertDictionary; import com.hz.pm.api.meta.service.IExpertDictionaryService; import com.hz.pm.api.sms.constant.VerificationCodeType; @@ -35,9 +44,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.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.model.enumeration.UserAvailableEnum; import com.hz.pm.api.user.service.IUserInfoService; import com.hz.pm.api.user.util.LoginUserUtil; import com.ningdatech.basic.exception.BizException; @@ -51,10 +60,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.time.*; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.Month; import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.BiFunction; import java.util.stream.Collectors; /** @@ -79,6 +92,8 @@ public class ExpertManage { private final IMeetingExpertJudgeService expertJudgeService; private final IExpertDictionaryService expertDictionaryService; private final DictionaryCache dictionaryCache; + private final MhExpertQrCodeGenClient expertQrCodeGenClient; + private final MhFileClient mhFileClient; @Value("${expert-registration.verify-code.check:true}") @@ -87,9 +102,9 @@ public class ExpertManage { private Map> listExpertDictionary(Long userId) { List dicts = expertDictionaryService.listByUserId(Collections.singleton(userId)); return dicts.stream().map(w -> { - Optional dict = dictionaryCache.getByCode(w.getDictionaryCode()); + Optional dict = dictionaryCache.getByCode(w.getDictionaryCode()); if (dict.isPresent()) { - DictDTO dto = dict.get(); + DictionaryDTO dto = dict.get(); return new DictionaryVO(dto.getDictionaryCode(), dto.getName(), dto.getDictionaryType()); } else { return null; @@ -121,7 +136,7 @@ public class ExpertManage { } } - public ExpertDetailVO getExpertDetail(Long userId) { + public ExpertDetailVO getExpertDetail(Long userId, boolean getFileDetail) { ExpertUserFullInfo eui = expertUserFullInfoService.getByUserId(userId); if (eui == null) { throw BizException.wrap("专家信息不存在"); @@ -133,10 +148,75 @@ public class ExpertManage { if (expertType != null) { isTechExpert = expertType.get(0).getDictionaryName().contains("技术"); } + String expertQrCode = expertQrCodeGenClient.genExpertQrCode(eui.getMhExpertId()); + expertDetail.setExpertQrCodeBase64(expertQrCode); expertDetail.setIsTechExpert(isTechExpert); + if (getFileDetail) { + processExpertFiles(expertDetail); + } return expertDetail; } + private void processExpertFiles(ExpertDetailVO expertDetail) { + List fileIdList = new ArrayList<>(); + BizUtils.notBlank(expertDetail.getIdCardFile(), fileIdList::add); + BizUtils.notBlank(expertDetail.getAvatarFile(), fileIdList::add); + BizUtils.notBlank(expertDetail.getRecommendFile(), fileIdList::add); + BizUtils.notBlank(expertDetail.getDegreeCertFile(), fileIdList::add); + BizUtils.notBlank(expertDetail.getGraduationCertFile(), fileIdList::add); + BizUtils.notBlank(expertDetail.getSocialInsureFile(), fileIdList::add); + BizUtils.notBlank(expertDetail.getItaicCredentials(), fileIdList::add); + BizUtils.notBlank(expertDetail.getMajorCredentials(), fileIdList::add); + String fileIds = String.join(",", fileIdList); + List fileInfoList = mhFileClient.listFileInfo(fileIds); + if (CollUtil.isEmpty(fileInfoList)) { + return; + } + Map fileMap = CollUtils.listToMap(fileInfoList, MhFileInfoDTO::getFileId); + + BiFunction, List> function = (str, map) -> { + String[] split = str.split(","); + return Arrays.stream(split).map(w -> { + MhFileInfoDTO fileInfoDto = map.get(w); + return BeanUtil.copyProperties(fileInfoDto, MhFileInfoVO.class); + }).filter(Objects::nonNull).collect(Collectors.toList()); + }; + + BizUtils.notBlank(expertDetail.getIdCardFile(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setIdCardFileDetail(files); + }); + BizUtils.notBlank(expertDetail.getAvatarFile(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setAvatarFileDetail(files); + }); + BizUtils.notBlank(expertDetail.getRecommendFile(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setRecommendFileDetail(files); + }); + BizUtils.notBlank(expertDetail.getDegreeCertFile(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setDegreeCertFileDetail(files); + }); + BizUtils.notBlank(expertDetail.getGraduationCertFile(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setGraduationCertFileDetail(files); + }); + BizUtils.notBlank(expertDetail.getSocialInsureFile(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setSocialInsureFileDetail(files); + }); + BizUtils.notBlank(expertDetail.getItaicCredentials(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setItaicCredentialsDetail(files); + }); + BizUtils.notBlank(expertDetail.getMajorCredentials(), w -> { + List files = function.apply(w, fileMap); + expertDetail.setMajorCredentialsDetail(files); + }); + + } + public Long generateOrGetUserId(ExpertBasicInfo basicInfo, Long operatorId) { String phoneNo = basicInfo.getPhoneNo(); UserInfo userInfo = userInfoService.getUserInfoByPhoneNo(phoneNo); 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 31c7e41..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 @@ -16,7 +16,7 @@ import com.hz.pm.api.expert.constant.ExpertApplyTypeEnum; import com.hz.pm.api.expert.constant.ExpertApplyTypeQueryEnum; import com.hz.pm.api.expert.entity.ExpertMetaApply; import com.hz.pm.api.expert.entity.ExpertUserFullInfo; -import com.hz.pm.api.expert.model.DictionaryFieldInfo; +import com.hz.pm.api.expert.model.DictFieldInfoDTO; import com.hz.pm.api.expert.model.TagFieldInfo; import com.hz.pm.api.expert.model.cmd.*; import com.hz.pm.api.expert.model.dto.ExpertDictionaryDTO; @@ -34,7 +34,7 @@ import com.hz.pm.api.meta.constant.ExpertDictTypeEnum; import com.hz.pm.api.meta.helper.DictionaryCache; import com.hz.pm.api.meta.model.ExpertRegionInfo; import com.hz.pm.api.meta.model.bo.RegionContainsBO; -import com.hz.pm.api.meta.model.dto.DictDTO; +import com.hz.pm.api.meta.model.dto.DictionaryDTO; import com.hz.pm.api.meta.model.entity.ExpertDictionary; import com.hz.pm.api.meta.service.IExpertDictionaryService; import com.hz.pm.api.sys.model.dto.RegionDTO; @@ -74,7 +74,7 @@ public class ExpertMetaApplyManage { public PageVo metaApplyListQuery(MetaApplyListQuery req) { // 筛选符合专家类型的用户id List filterExpertTypeUserIdList = null; - DictionaryFieldInfo expertType = req.getExpertType(); + DictFieldInfoDTO expertType = req.getExpertType(); if (Objects.nonNull(expertType) && StringUtils.isNotBlank(expertType.getDictionaryCode())) { List expertTypeDictionaryList = iExpertDictionaryService.list(Wrappers.lambdaQuery(ExpertDictionary.class) .eq(ExpertDictionary::getDictionaryCode, expertType.getDictionaryCode())); @@ -383,21 +383,11 @@ 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 -> { - Optional dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode()); - DictionaryFieldInfo dictionaryFieldInfo = new DictionaryFieldInfo(); + Optional dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode()); + DictFieldInfoDTO dictionaryFieldInfo = new DictFieldInfoDTO(); dictionaryFieldInfo.setDictionaryCode(r.getDictionaryCode()); dictionaryFieldInfo.setDictionaryFieldName(r.getExpertInfoField()); dictionaryDTO.ifPresent(dictDTO -> dictionaryFieldInfo.setDictionaryName(dictDTO.getName())); @@ -409,8 +399,8 @@ public class ExpertMetaApplyManage { List expertTypeDictionaryList = expertTypeDictMap.get(userId); if (CollectionUtils.isNotEmpty(titleLevelDictionaryList)) { expertApplyMetaVO.setExpertType(expertTypeDictionaryList.stream().map(r -> { - Optional dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode()); - DictionaryFieldInfo dictionaryFieldInfo = new DictionaryFieldInfo(); + Optional dictionaryDTO = dictionaryCache.getByCode(r.getDictionaryCode()); + DictFieldInfoDTO dictionaryFieldInfo = new DictFieldInfoDTO(); dictionaryFieldInfo.setDictionaryCode(r.getDictionaryCode()); dictionaryFieldInfo.setDictionaryFieldName(r.getExpertInfoField()); dictionaryDTO.ifPresent(dictDTO -> dictionaryFieldInfo.setDictionaryName(dictDTO.getName())); @@ -468,7 +458,7 @@ public class ExpertMetaApplyManage { expertStorageDealCmd.setApplyResult(applyResult); if (Objects.nonNull(extraInfo)) { - List expertType = extraInfo.getExpertType(); + List expertType = extraInfo.getExpertType(); if (CollUtil.isNotEmpty(expertType)) { expertStorageDealCmd.setExpertType(extraInfo.getExpertType().stream().map(r -> { ExpertDictionaryDTO expertDictionaryDTO = new ExpertDictionaryDTO(); 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 @@