diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java index 656a9248..a5b38117 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java @@ -1,16 +1,15 @@ package cn.axzo.nanopart.visa.server.rpc; import cn.axzo.apollo.workspace.api.workspace.ProjectApi; -import cn.axzo.apollo.workspace.api.workspace.res.ProjectBriefResp; +import cn.axzo.apollo.workspace.api.workspace.req.QueryProjectApiReq; import cn.axzo.apollo.workspace.api.workspace.res.ProjectDetailRes; +import cn.axzo.apollo.workspace.api.workspace.res.ProjectPureRes; import cn.axzo.basics.common.util.NumberUtil; import cn.axzo.nanopart.visa.server.utils.RpcUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** @@ -32,11 +31,16 @@ public class VisaProjectApiGateway { return RpcUtil.rpcResultProcessor(() -> projectApi.getById(id), "通过id获取工程详情", id); } - public List getProjectBriefByIds(List ids) { - if (CollectionUtils.isEmpty(ids)) { - return Collections.emptyList(); - } - return RpcUtil.rpcResultProcessor(() -> projectApi.simpleList(ids), "通过ids获取工程简单信息", ids); +// public List getProjectBriefByIds(List ids) { +// if (CollectionUtils.isEmpty(ids)) { +// return Collections.emptyList(); +// } +// return RpcUtil.rpcResultProcessor(() -> projectApi.simpleList(ids), "通过ids获取工程简单信息", ids); +// } + + public List getProjectList(QueryProjectApiReq req) { + return RpcUtil.rpcResultProcessor(() -> projectApi.getList(req), + "获取工程列表", req); } diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 4f6b22aa..3ee23618 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -3,9 +3,10 @@ package cn.axzo.nanopart.visa.server.service.impl; import cn.axzo.apollo.api.req.QueryOrderToBasicReq; import cn.axzo.apollo.api.res.ConstructionAreaInfo; import cn.axzo.apollo.api.res.TaskOrderToBasicRes; +import cn.axzo.apollo.workspace.api.workspace.req.QueryProjectApiReq; import cn.axzo.apollo.workspace.api.workspace.res.GetDetailRes; -import cn.axzo.apollo.workspace.api.workspace.res.ProjectBriefResp; import cn.axzo.apollo.workspace.api.workspace.res.ProjectDetailRes; +import cn.axzo.apollo.workspace.api.workspace.res.ProjectPureRes; import cn.axzo.basics.common.constant.enums.OrganizationalNodeTypeEnum; import cn.axzo.basics.common.constant.enums.OrganizationalUnitTypeEnum; import cn.axzo.basics.common.util.AssertUtil; @@ -1368,12 +1369,15 @@ public class ChangeRecordServiceImpl extends ServiceImpl getProjectInfoMapById(List projectIdList) { - List projectBriefByIds = visaProjectApiGateway.getProjectBriefByIds(projectIdList); - if (CollectionUtils.isEmpty(projectBriefByIds)) { + QueryProjectApiReq req = QueryProjectApiReq.builder() + .ids(projectIdList) + .build(); + List projectByIds = visaProjectApiGateway.getProjectList(req); + if (CollectionUtils.isEmpty(projectByIds)) { return Collections.emptyMap(); } // Map - return projectBriefByIds.stream().collect(Collectors.toMap(ProjectBriefResp::getId, ProjectBriefResp::getName)); + return projectByIds.stream().collect(Collectors.toMap(ProjectPureRes::getId, ProjectPureRes::getName)); } private Map getInitiatorMapByVisaId(List visaIdList) {