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

feat(测试计划): 规划根节点支持配置运行模式 

--story=1015333 --user=宋昌昌 【测试计划】完成剩余功能 https://www.tapd.cn/55049933/s/1547478
This commit is contained in:
song-cc-rock 2024-07-12 14:40:04 +08:00 committed by Craftsman
parent 551f88546a
commit b97ae530f9
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanCollectionMinderService.java
View File

@ -58,6 +58,9 @@ public class TestPlanCollectionMinderService {
@Autowired @Autowired
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
@Resource
private TestPlanConfigMapper testPlanConfigMapper;
/** /**
* 测试计划-脑图用例列表查询 * 测试计划-脑图用例列表查询
* *
@ -67,7 +70,15 @@ public class TestPlanCollectionMinderService {
List<TestPlanCollectionMinderTreeDTO> list = new ArrayList<>(); List<TestPlanCollectionMinderTreeDTO> list = new ArrayList<>();
List<TestPlanCollectionConfigDTO> testPlanCollections = extTestPlanCollectionMapper.getList(planId); List<TestPlanCollectionConfigDTO> testPlanCollections = extTestPlanCollectionMapper.getList(planId);
//构造根节点 //构造根节点
TestPlanConfig testPlanConfig = testPlanConfigMapper.selectByPrimaryKey(planId);
TestPlanCollectionMinderTreeNodeDTO testPlanCollectionMinderTreeNodeDTO = buildRoot(); TestPlanCollectionMinderTreeNodeDTO testPlanCollectionMinderTreeNodeDTO = buildRoot();
// 根节点使用计划配置的执行方式
testPlanCollectionMinderTreeNodeDTO.setExecuteMethod(testPlanConfig.getCaseRunMode());
if (StringUtils.equalsIgnoreCase(testPlanCollectionMinderTreeNodeDTO.getExecuteMethod(), ApiBatchRunMode.PARALLEL.toString())) {
testPlanCollectionMinderTreeNodeDTO.setPriority(3);
} else {
testPlanCollectionMinderTreeNodeDTO.setPriority(2);
}
TestPlanCollectionMinderTreeDTO testPlanCollectionMinderTreeDTO = new TestPlanCollectionMinderTreeDTO(); TestPlanCollectionMinderTreeDTO testPlanCollectionMinderTreeDTO = new TestPlanCollectionMinderTreeDTO();
testPlanCollectionMinderTreeDTO.setData(testPlanCollectionMinderTreeNodeDTO); testPlanCollectionMinderTreeDTO.setData(testPlanCollectionMinderTreeNodeDTO);
//构造type节点 //构造type节点
@ -249,6 +260,17 @@ public class TestPlanCollectionMinderService {
private void dealEditList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap) { private void dealEditList(TestPlanCollectionMinderEditRequest request, String userId, Map<String, List<BaseCollectionAssociateRequest>> associateMap) {
if (CollectionUtils.isNotEmpty(request.getEditList())) { if (CollectionUtils.isNotEmpty(request.getEditList())) {
// 根节点直接过滤后存在直接处理串并行参数
request.getEditList().stream()
.filter(minderNode -> StringUtils.equals(minderNode.getId(), ModuleConstants.DEFAULT_NODE_ID))
.findFirst()
.ifPresent(rootNode -> {
String executeMethod = rootNode.getExecuteMethod();
TestPlanConfig config = new TestPlanConfig();
config.setTestPlanId(request.getPlanId());
config.setCaseRunMode(executeMethod);
testPlanConfigMapper.updateByPrimaryKeySelective(config);
});
Map<String, List<TestPlanCollection>> parentMap = getParentMap(request); Map<String, List<TestPlanCollection>> parentMap = getParentMap(request);
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);
TestPlanCollectionMapper collectionMapper = sqlSession.getMapper(TestPlanCollectionMapper.class); TestPlanCollectionMapper collectionMapper = sqlSession.getMapper(TestPlanCollectionMapper.class);