wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3300): 获取工程列表接口调整

Browse Source
This commit is contained in:
chenwenjian 2025-02-28 14:25:18 +08:00
parent 4dbed2ec61
commit caf4c39ec9
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/rpc/VisaProjectApiGateway.java
View File

@ -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<ProjectBriefResp> getProjectBriefByIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return Collections.emptyList();
}
return RpcUtil.rpcResultProcessor(() -> projectApi.simpleList(ids), "通过ids获取工程简单信息", ids);
// public List<ProjectBriefResp> getProjectBriefByIds(List<Long> ids) {
// if (CollectionUtils.isEmpty(ids)) {
// return Collections.emptyList();
// }
// return RpcUtil.rpcResultProcessor(() -> projectApi.simpleList(ids), "通过ids获取工程简单信息", ids);
// }
public List<ProjectPureRes> getProjectList(QueryProjectApiReq req) {
return RpcUtil.rpcResultProcessor(() -> projectApi.getList(req),
"获取工程列表", req);
}

12
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -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<ChangeRecordDao, Change
}
private Map<Long, String> getProjectInfoMapById(List<Long> projectIdList) {
List<ProjectBriefResp> projectBriefByIds = visaProjectApiGateway.getProjectBriefByIds(projectIdList);
if (CollectionUtils.isEmpty(projectBriefByIds)) {
QueryProjectApiReq req = QueryProjectApiReq.builder()
.ids(projectIdList)
.build();
List<ProjectPureRes> projectByIds = visaProjectApiGateway.getProjectList(req);
if (CollectionUtils.isEmpty(projectByIds)) {
return Collections.emptyMap();
}
// Map<projectId,name>
return projectBriefByIds.stream().collect(Collectors.toMap(ProjectBriefResp::getId, ProjectBriefResp::getName));
return projectByIds.stream().collect(Collectors.toMap(ProjectPureRes::getId, ProjectPureRes::getName));
}
private Map<Long, ChangeRecordConfirm> getInitiatorMapByVisaId(List<Long> visaIdList) {