From d543184f53462a751ff55fb5c4a4f9ce854bc9d2 Mon Sep 17 00:00:00 2001 From: songyuanlun Date: Tue, 24 Dec 2024 14:02:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3282):=20=E8=B0=83=E6=95=B4=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E5=88=86=E9=A1=B5=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orgmanax/api/orgjob/feign/OrgJobApi.java | 4 - ...odeConstants.java => OrgJobConstants.java} | 3 +- .../axzo/orgmanax/dto/job/dto/OrgJobDTO.java | 4 +- .../orgmanax/dto/job/req/ListOrgJobReq.java | 42 ---------- .../orgmanax/dto/job/req/PageOrgJobReq.java | 21 +++++ .../orgjob/controller/OrgJobController.java | 10 +-- .../foundation/OrgJobFoundationService.java | 4 +- .../impl/OrgJobFoundationServiceImpl.java | 6 +- .../OrgJobGroupFoundationServiceImpl.java | 2 +- ...JobGroupRelationFoundationServiceImpl.java | 2 +- .../server/orgjob/service/OrgJobService.java | 14 +--- .../service/dto/OrgJobAggregatePageParam.java | 77 ------------------- .../orgjob/service/dto/OrgJobPageParam.java | 73 +++++++++++------- .../service/impl/OrgJobServiceImpl.java | 43 ++++------- 14 files changed, 100 insertions(+), 205 deletions(-) rename orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/{OrgJobCodeConstants.java => OrgJobConstants.java} (93%) delete mode 100644 orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/ListOrgJobReq.java delete mode 100644 orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobAggregatePageParam.java diff --git a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/feign/OrgJobApi.java b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/feign/OrgJobApi.java index 3ec3ec4..9231171 100644 --- a/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/feign/OrgJobApi.java +++ b/orgmanax-api/src/main/java/cn/axzo/orgmanax/api/orgjob/feign/OrgJobApi.java @@ -5,7 +5,6 @@ import cn.axzo.foundation.result.ApiResult; import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO; import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq; import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq; -import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq; import cn.axzo.orgmanax.dto.job.req.PageOrgJobReq; import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq; import org.springframework.cloud.openfeign.FeignClient; @@ -27,9 +26,6 @@ public interface OrgJobApi { @PostMapping("/api/job/delete") ApiResult delete(@RequestBody @Validated DeleteOrgJobReq req); - @PostMapping("/api/job/list") - ApiResult> list(@RequestBody @Validated ListOrgJobReq req); - /** * 分页列表接口。 * XXX：本接口默认分页，单页最多返回1000条数据。调用方使用时需注意。 diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobCodeConstants.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java similarity index 93% rename from orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobCodeConstants.java rename to orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java index 1b1911a..7f5a16b 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobCodeConstants.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobConstants.java @@ -7,7 +7,7 @@ package cn.axzo.orgmanax.dto.job.dto; * @date 2024/2/27 * @version 1.0 */ -public interface OrgJobCodeConstants { +public interface OrgJobConstants { /** 项目内工人 **/ String PROJ_WORKER = "projWorker"; @@ -36,4 +36,5 @@ public interface OrgJobCodeConstants { String OLD_CONFIG = "oldJobConfigs"; String CODE_KEY = "code"; String OLD_NEW_JOB_CODE_MAP_KEY = "job_code_mapping"; + Integer JOB_PAGE_SIZE = 1000; } diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobDTO.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobDTO.java index b5e88cf..31a8a44 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobDTO.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/dto/OrgJobDTO.java @@ -1,7 +1,7 @@ package cn.axzo.orgmanax.dto.job.dto; -import static cn.axzo.orgmanax.dto.job.dto.OrgJobCodeConstants.CODE_KEY; -import static cn.axzo.orgmanax.dto.job.dto.OrgJobCodeConstants.OLD_CONFIG; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.CODE_KEY; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.OLD_CONFIG; import cn.axzo.orgmanax.dto.job.enums.OrgJobFlagEnum; import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum; diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/ListOrgJobReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/ListOrgJobReq.java deleted file mode 100644 index d9257c0..0000000 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/ListOrgJobReq.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.axzo.orgmanax.dto.job.req; - -import cn.axzo.foundation.page.PageReqV2; -import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum; -import java.util.Set; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -@AllArgsConstructor -@Data -@SuperBuilder -public class ListOrgJobReq extends PageReqV2 { - - /** - * 名称 - */ - private String name; - - /** - * 岗位id集合 - */ - private Set jobIds; - /** - * 岗位编码集合 - */ - private Set jobCodes; - /** - * 岗位类型 - */ - private OrgJobTypeEnum type; - /** - * 搜索关键字 - * Notice: 名称或别名的模糊搜索 - */ - private String keyword; - -} diff --git a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/PageOrgJobReq.java b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/PageOrgJobReq.java index 8f01bbb..b2b3019 100644 --- a/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/PageOrgJobReq.java +++ b/orgmanax-dto/src/main/java/cn/axzo/orgmanax/dto/job/req/PageOrgJobReq.java @@ -59,4 +59,25 @@ public class PageOrgJobReq extends PageReqV2 { */ private OrgJobTypeEnum type; + /** + * 岗位类型 1：总包单位 2：建设单位 3：监理单位 4：劳务分包 5：专业分包 6:OMS 7：企业通用 9:班组项目内 + */ + private List types; + + /** + * 可为空,即加载默认和自定义所有岗位 true预定义岗位 false 自定义岗位 + */ + private Boolean readonly; + + // workspace和unitId 只有自定义类型使用 + /** + * 单位/团队 ID 列表 + */ + private List unitIds; + + /** + * 工作台id 列表 + */ + private List workspaceIds; + } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/controller/OrgJobController.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/controller/OrgJobController.java index 3de9f77..52a77c4 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/controller/OrgJobController.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/controller/OrgJobController.java @@ -6,11 +6,10 @@ import cn.axzo.orgmanax.api.orgjob.feign.OrgJobApi; import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO; import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq; import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq; -import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq; import cn.axzo.orgmanax.dto.job.req.PageOrgJobReq; import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq; import cn.axzo.orgmanax.server.orgjob.service.OrgJobService; -import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobAggregatePageParam; +import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,13 +38,8 @@ public class OrgJobController implements OrgJobApi { return ApiResult.success(); } - @Override - public ApiResult> list(ListOrgJobReq req) { - return ApiResult.success(orgJobService.list(req)); - } - @Override public ApiResult> page(PageOrgJobReq req) { - return ApiResult.success(orgJobService.page(BeanUtil.copyProperties(req, OrgJobAggregatePageParam.class))); + return ApiResult.success(orgJobService.page(BeanUtil.copyProperties(req, OrgJobPageParam.class))); } } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobFoundationService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobFoundationService.java index a49db07..2e519db 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobFoundationService.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/OrgJobFoundationService.java @@ -1,9 +1,9 @@ package cn.axzo.orgmanax.server.orgjob.foundation; import cn.axzo.foundation.page.PageResp; -import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq; import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO; import cn.axzo.orgmanax.server.orgjob.foundation.dto.OrgJobCreator; +import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam; /** * @@ -35,5 +35,5 @@ public interface OrgJobFoundationService { * 查询岗位信息 * @return */ - PageResp page(ListOrgJobReq req); + PageResp page(OrgJobPageParam req); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java index 2ac38fc..6f1ec52 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobFoundationServiceImpl.java @@ -2,12 +2,12 @@ package cn.axzo.orgmanax.server.orgjob.foundation.impl; import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO; -import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq; import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob; import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobQueryRepository; import cn.axzo.orgmanax.infra.dao.orgjob.repository.OrgJobUpsertRepository; import cn.axzo.orgmanax.server.orgjob.foundation.OrgJobFoundationService; import cn.axzo.orgmanax.server.orgjob.foundation.dto.OrgJobCreator; +import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam; import cn.hutool.core.bean.BeanUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -39,7 +39,7 @@ public class OrgJobFoundationServiceImpl implements OrgJobFoundationService { } @Override - public PageResp page(ListOrgJobReq req) { + public PageResp page(OrgJobPageParam req) { PageResp page = orgJobQueryRepository.page(convert(req)); return PageResp.builder() .size(page.getSize()) @@ -49,7 +49,7 @@ public class OrgJobFoundationServiceImpl implements OrgJobFoundationService { .build(); } - public OrgJobQueryRepository.ListReq convert(ListOrgJobReq req) { + public OrgJobQueryRepository.ListReq convert(OrgJobPageParam req) { OrgJobQueryRepository.ListReq param = BeanUtil.copyProperties(req, OrgJobQueryRepository.ListReq.class); param.setIds(req.getJobIds()); param.setCodes(req.getJobCodes()); diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java index 247f48c..1c3f29b 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupFoundationServiceImpl.java @@ -1,6 +1,6 @@ package cn.axzo.orgmanax.server.orgjob.foundation.impl; -import static cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam.JOB_PAGE_SIZE; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.JOB_PAGE_SIZE; import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.dto.job.dto.OrgJobGroupDTO; diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java index acc91ad..9697a5b 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/foundation/impl/OrgJobGroupRelationFoundationServiceImpl.java @@ -1,6 +1,6 @@ package cn.axzo.orgmanax.server.orgjob.foundation.impl; -import static cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam.JOB_PAGE_SIZE; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.JOB_PAGE_SIZE; import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.dto.job.dto.OrgJobGroupRelationDTO; diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobService.java index c66fe27..4a86acc 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobService.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/OrgJobService.java @@ -4,9 +4,8 @@ import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO; import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq; import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq; -import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq; import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq; -import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobAggregatePageParam; +import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam; public interface OrgJobService { @@ -32,14 +31,7 @@ public interface OrgJobService { void delete(DeleteOrgJobReq req); /** - * 查询岗位 - * @param req - * @return + * 分页查询岗位 */ - PageResp list(ListOrgJobReq req); - - /** - * 聚合查询岗位 - */ - PageResp page(OrgJobAggregatePageParam req); + PageResp page(OrgJobPageParam req); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobAggregatePageParam.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobAggregatePageParam.java deleted file mode 100644 index 61e0d89..0000000 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobAggregatePageParam.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.axzo.orgmanax.server.orgjob.service.dto; - -import cn.axzo.foundation.page.PageReqV2; -import cn.axzo.orgmanax.dto.job.enums.OrgJobGroupFlagEnum; -import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum; -import cn.hutool.core.collection.CollUtil; -import java.util.Objects; -import java.util.Set; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.StringUtils; - -/** - * @author luofu - * @version 1.0 - * @date 2024/9/12 - */ -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class OrgJobAggregatePageParam extends PageReqV2 { - - /** - * 岗位分组标识集合 - */ - private Set orgJobGroupFlags; - /** - * 分组编码集合 - */ - private Set orgJobGroupCodes; - /** - * 岗位id集合 - */ - private Set jobIds; - /** - * 岗位编码集合 - */ - private Set jobCodes; - /** - * 岗位类型 - */ - private OrgJobTypeEnum type; - /** - * 搜索关键字 - * Notice: 名称或别名的模糊搜索 - */ - private String keyword; - - /** - * 是否需要查询角色信息 - */ - @Builder.Default - private Boolean needSaasRole = false; - /** - * 是否需要查询岗位分组信息 - */ - @Builder.Default - private Boolean needJobGroup = false; - - public boolean isInvalid() { - return CollUtil.isEmpty(orgJobGroupFlags) - && CollUtil.isEmpty(orgJobGroupCodes) - && CollUtil.isEmpty(jobIds) - && CollUtil.isEmpty(jobCodes) - && Objects.isNull(type) - && StringUtils.isBlank(keyword); - } - - @Override - public String toString() { - return super.toString(); - } -} diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobPageParam.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobPageParam.java index 081162d..15a66d9 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobPageParam.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/dto/OrgJobPageParam.java @@ -1,13 +1,14 @@ package cn.axzo.orgmanax.server.orgjob.service.dto; import cn.axzo.foundation.page.PageReqV2; +import cn.axzo.orgmanax.dto.job.enums.OrgJobGroupFlagEnum; import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum; -import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import java.util.List; import java.util.Objects; import java.util.Set; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -16,7 +17,7 @@ import org.apache.commons.lang3.StringUtils; /** * @author luofu * @version 1.0 - * @date 2024/9/18 + * @date 2024/9/12 */ @Data @SuperBuilder @@ -25,8 +26,15 @@ import org.apache.commons.lang3.StringUtils; public class OrgJobPageParam extends PageReqV2 { public static final OrgJobPageParam EMPTY_INSTANCE = new OrgJobPageParam(); - public static final Integer JOB_PAGE_SIZE = 1000; + /** + * 岗位分组标识集合 + */ + private Set orgJobGroupFlags; + /** + * 分组编码集合 + */ + private Set orgJobGroupCodes; /** * 岗位id集合 */ @@ -45,36 +53,47 @@ public class OrgJobPageParam extends PageReqV2 { */ private String keyword; - public static OrgJobPageParam from(OrgJobAggregatePageParam param) { - OrgJobPageParam jobPageParam = new OrgJobPageParam(); - jobPageParam.setType(param.getType()); - jobPageParam.setKeyword(param.getKeyword()); - jobPageParam.setJobIds(param.getJobIds()); - jobPageParam.setJobCodes(param.getJobCodes()); - jobPageParam.setPage(param.getPage()); - jobPageParam.setPageSize(param.getPageSize()); - return jobPageParam; - } + /** + * 是否需要查询角色信息 + */ + @Builder.Default + private Boolean needSaasRole = false; + /** + * 是否需要查询岗位分组信息 + */ + @Builder.Default + private Boolean needJobGroup = false; + + /** + * 岗位类型 1：总包单位 2：建设单位 3：监理单位 4：劳务分包 5：专业分包 6:OMS 7：企业通用 9:班组项目内 + */ + private List types; + + /** + * 可为空,即加载默认和自定义所有岗位 true预定义岗位 false 自定义岗位 + */ + private Boolean readonly; + + // workspace和unitId 只有自定义类型使用 + /** + * 单位/团队 ID 列表 + */ + private List unitIds; + + /** + * 工作台id 列表 + */ + private List workspaceIds; public boolean isInvalid() { - return CollUtil.isEmpty(jobIds) + return CollUtil.isEmpty(orgJobGroupFlags) + && CollUtil.isEmpty(orgJobGroupCodes) + && CollUtil.isEmpty(jobIds) && CollUtil.isEmpty(jobCodes) && Objects.isNull(type) && StringUtils.isBlank(keyword); } - public ListOrgJobReq convert() { - return BeanUtil.toBean(this, ListOrgJobReq.class); - } - -// public Integer getPage() { -// return Optional.ofNullable(super.getPage()).orElse(1); -// } -// -// public Integer getPageSize() { -// return Optional.ofNullable(super.getPageSize()).orElse(20); -// } - @Override public String toString() { return super.toString(); diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java index b67bafb..f724fd7 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/orgjob/service/impl/OrgJobServiceImpl.java @@ -1,27 +1,25 @@ package cn.axzo.orgmanax.server.orgjob.service.impl; -import static cn.axzo.orgmanax.dto.job.dto.OrgJobCodeConstants.CODE_KEY; -import static cn.axzo.orgmanax.dto.job.dto.OrgJobCodeConstants.OLD_CONFIG; -import static cn.axzo.orgmanax.dto.job.dto.OrgJobCodeConstants.OLD_NEW_JOB_CODE_MAP_KEY; -import static cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam.JOB_PAGE_SIZE; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.CODE_KEY; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.JOB_PAGE_SIZE; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.OLD_CONFIG; +import static cn.axzo.orgmanax.dto.job.dto.OrgJobConstants.OLD_NEW_JOB_CODE_MAP_KEY; import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.dto.job.dto.OrgJobDTO; +import cn.axzo.orgmanax.dto.job.dto.OrgJobGroupDTO; +import cn.axzo.orgmanax.dto.job.dto.OrgJobGroupRelationDTO; import cn.axzo.orgmanax.dto.job.dto.RoleDTO; import cn.axzo.orgmanax.dto.job.enums.OrgJobTypeEnum; import cn.axzo.orgmanax.dto.job.req.CreateOrgJobReq; import cn.axzo.orgmanax.dto.job.req.DeleteOrgJobReq; -import cn.axzo.orgmanax.dto.job.req.ListOrgJobReq; import cn.axzo.orgmanax.dto.job.req.UpdateOrgJobReq; -import cn.axzo.orgmanax.dto.job.dto.OrgJobGroupDTO; -import cn.axzo.orgmanax.dto.job.dto.OrgJobGroupRelationDTO; import cn.axzo.orgmanax.infra.client.tyr.RoleGateway; import cn.axzo.orgmanax.server.orgjob.foundation.OrgJobFoundationService; import cn.axzo.orgmanax.server.orgjob.foundation.OrgJobGroupFoundationService; import cn.axzo.orgmanax.server.orgjob.foundation.OrgJobGroupRelationFoundationService; import cn.axzo.orgmanax.server.orgjob.foundation.dto.OrgJobCreator; import cn.axzo.orgmanax.server.orgjob.service.OrgJobService; -import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobAggregatePageParam; import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobGroupPageParam; import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobGroupRelationPageParam; import cn.axzo.orgmanax.server.orgjob.service.dto.OrgJobPageParam; @@ -86,18 +84,13 @@ public class OrgJobServiceImpl implements OrgJobService { } @Override - public PageResp list(ListOrgJobReq req) { - return foundationService.page(req); - } - - @Override - public PageResp page(OrgJobAggregatePageParam param) { + public PageResp page(OrgJobPageParam param) { if (param.isInvalid()) { log.info("org job page param is invalid. param:{}", JSONUtil.toJsonStr(param)); return PageResp.builder().build(); } OrgJobPageParam orgJobPageParam = resolveJobPageParam(param); - PageResp orgJobs = foundationService.page(orgJobPageParam.convert()); + PageResp orgJobs = foundationService.page(param); if (CollUtil.isEmpty(orgJobs.getData())) { log.info("org job page there is not any job. param:{}", JSONUtil.toJsonStr(orgJobPageParam)); return PageResp.builder().build(); @@ -183,12 +176,11 @@ public class OrgJobServiceImpl implements OrgJobService { .forEach(e -> e.setJobGroup(groupMap.get(relationGroup.get(e.getCode())))); } - private OrgJobPageParam resolveJobPageParam(OrgJobAggregatePageParam param) { - OrgJobPageParam jobPageParam = OrgJobPageParam.from(param); - jobPageParam.setJobCodes(resolveJobCodes(param.getJobCodes())); + private OrgJobPageParam resolveJobPageParam(OrgJobPageParam param) { + param.setJobCodes(resolveJobCodes(param.getJobCodes())); if (CollUtil.isEmpty(param.getOrgJobGroupCodes()) && CollUtil.isEmpty(param.getOrgJobGroupFlags())) { - return jobPageParam; + return param; } // 通过分组相关参数参数JOB OrgJobGroupPageParam groupListParam = OrgJobGroupPageParam.builder() @@ -201,20 +193,20 @@ public class OrgJobServiceImpl implements OrgJobService { JSONUtil.toJsonStr(groupListParam)); return OrgJobPageParam.EMPTY_INSTANCE; } - if (CollUtil.isEmpty(jobPageParam.getJobCodes())) { + if (CollUtil.isEmpty(param.getJobCodes())) { // 直接设置jobCodes入参 - jobPageParam.setJobCodes(jobCodes); + param.setJobCodes(jobCodes); } else { // jobCodes取交集 - Collection intersection = CollUtil.intersection(jobPageParam.getJobCodes(), jobCodes); + Collection intersection = CollUtil.intersection(param.getJobCodes(), jobCodes); if (CollUtil.isEmpty(intersection)) { log.info("resolveJobPageParam the intersection is empty. param:{}", JSONUtil.toJsonStr(groupListParam)); return OrgJobPageParam.EMPTY_INSTANCE; } - jobPageParam.setJobCodes(Sets.newHashSet(intersection)); + param.setJobCodes(Sets.newHashSet(intersection)); } - return jobPageParam; + return param; } private Set resolveJobCodesByGroup(OrgJobGroupPageParam groupListParam) { @@ -251,14 +243,13 @@ public class OrgJobServiceImpl implements OrgJobService { } public List whileQuery(OrgJobPageParam param) { - ListOrgJobReq listParam = ListOrgJobReq.builder().type(param.getType()).build(); List jobs = new ArrayList<>(); PageResp jobPage; int pageNumber = 0; param.setPageSize(JOB_PAGE_SIZE); do { param.setPage(++pageNumber); - jobPage = foundationService.page(listParam); + jobPage = foundationService.page(param); if (CollUtil.isNotEmpty(jobPage.getData())) { jobs.addAll(jobPage.getData()); }