test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(项目管理): 优化应用管理配置资源池下拉框数据

This commit is contained in:
WangXu10 2024-02-02 13:45:17 +08:00 committed by 刘瑞斌
parent 7591efb3ca
commit d60333c178
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectService.java
View File

@ -138,33 +138,18 @@ public class ProjectService {
} }
private List<String> getPoolIds(String projectId) { private List<String> getPoolIds(String projectId) {
List<String> poolIds = new ArrayList<>();
ProjectTestResourcePoolExample example = new ProjectTestResourcePoolExample(); ProjectTestResourcePoolExample example = new ProjectTestResourcePoolExample();
example.createCriteria().andProjectIdEqualTo(projectId); example.createCriteria().andProjectIdEqualTo(projectId);
List<ProjectTestResourcePool> projectPools = projectTestResourcePoolMapper.selectByExample(example); List<ProjectTestResourcePool> projectPools = projectTestResourcePoolMapper.selectByExample(example);
if (CollectionUtils.isNotEmpty(projectPools)) {
return projectPools.stream().map(ProjectTestResourcePool::getTestResourcePoolId).toList(); return projectPools.stream().map(ProjectTestResourcePool::getTestResourcePoolId).toList();
} }
//判断项目所属组织是否关联了资源池
Project project = projectMapper.selectByPrimaryKey(projectId);
TestResourcePoolOrganizationExample orgExample = new TestResourcePoolOrganizationExample();
orgExample.createCriteria().andOrgIdEqualTo(project.getOrganizationId());
List<TestResourcePoolOrganization> orgPools = testResourcePoolOrganizationMapper.selectByExample(orgExample);
if (CollectionUtils.isNotEmpty(orgPools)) {
poolIds.addAll(orgPools.stream().map(TestResourcePoolOrganization::getTestResourcePoolId).toList());
}
//获取应用全部组织的资源池
TestResourcePoolExample poolExample = new TestResourcePoolExample();
poolExample.createCriteria().andAllOrgEqualTo(true).andEnableEqualTo(true).andDeletedEqualTo(false);
List<TestResourcePool> testResourcePools = testResourcePoolMapper.selectByExample(poolExample);
poolIds.addAll(testResourcePools.stream().map(TestResourcePool::getId).toList());
poolIds = poolIds.stream().distinct().filter(StringUtils::isNotBlank).toList();
return poolIds;
}
public List<OptionDTO> getPoolOptions(String projectId, String type) { public List<OptionDTO> getPoolOptions(String projectId, String type) {
checkProjectNotExist(projectId); checkProjectNotExist(projectId);
List<String> poolIds = getPoolIds(projectId); List<String> poolIds = getPoolIds(projectId);
if(CollectionUtils.isEmpty(poolIds)){
return new ArrayList<>();
}
TestResourcePoolExample example = new TestResourcePoolExample(); TestResourcePoolExample example = new TestResourcePoolExample();
TestResourcePoolExample.Criteria criteria = example.createCriteria(); TestResourcePoolExample.Criteria criteria = example.createCriteria();
criteria.andIdIn(poolIds).andEnableEqualTo(true).andDeletedEqualTo(false); criteria.andIdIn(poolIds).andEnableEqualTo(true).andDeletedEqualTo(false);