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

fix(测试计划): 子测试计划计划进行复制时校验计划组容量 

【【测试计划】计划组下已经有20个子计划-复制子计划成功】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001043141
This commit is contained in:
Jianguo-Genius 2024-06-26 11:31:14 +08:00 committed by 刘瑞斌
parent 77f49d7cf4
commit 5dba41b3e2
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanBatchOperationService.java
View File

@ -172,10 +172,9 @@ public class TestPlanBatchOperationService extends TestPlanBaseUtilsService {
pos = 0L;
} else {
TestPlan group = testPlanMapper.selectByPrimaryKey(targetId);
//已归档的无法操作
if (group == null || StringUtils.equalsIgnoreCase(group.getStatus(), TestPlanConstants.TEST_PLAN_STATUS_ARCHIVED)
|| !StringUtils.equalsIgnoreCase(group.getType(), TestPlanConstants.TEST_PLAN_TYPE_GROUP)) {
throw new MSException(Translator.get("test_plan.group.error"));
//如果目标ID是测试计划组， 需要进行容量校验
if (!StringUtils.equalsIgnoreCase(targetType, ModuleConstants.NODE_TYPE_DEFAULT)) {
testPlanGroupService.validateGroupCapacity(targetId, 1);
}
pos = testPlanGroupService.getNextOrder(targetId);
moduleId = group.getModuleId();

4
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanExecuteService.java
View File

@ -439,6 +439,10 @@ public class TestPlanExecuteService {
}
String queueType = QUEUE_PREFIX_TEST_PLAN_COLLECTION;
TestPlanExecutionQueue nextQueue = testPlanExecuteSupportService.getNextQueue(queueID, queueType);
if (nextQueue == null) {
LogUtils.info("没有获取到下一个执行节点！ 原始ID[{}]，队列ID[{}]", paramQueueId, queueID);
return;
}
LogUtils.info("获取执行节点完成： 队列ID[{}],队列类型[{},串并行:[{}]执行是否结束[{}],是否是最后一个[{}],当前查出节点的资源ID[{}]]，下一个节点的执行工作准备中...",
queueID, queueType, nextQueue.getRunMode(), nextQueue.isExecuteFinish(), nextQueue.isLastOne(), nextQueue.getSourceID());
if (StringUtils.equalsIgnoreCase(nextQueue.getRunMode(), ApiBatchRunMode.SERIAL.name())) {

2
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanGroupService.java
View File

@ -97,7 +97,7 @@ public class TestPlanGroupService extends TestPlanSortService {
if (!StringUtils.equals(groupId, TestPlanConstants.TEST_PLAN_DEFAULT_GROUP_ID)) {
// 判断测试计划组是否存在
TestPlan groupPlan = testPlanMapper.selectByPrimaryKey(groupId);
if (StringUtils.equalsIgnoreCase(groupPlan.getStatus(), TestPlanConstants.TEST_PLAN_STATUS_ARCHIVED)) {
if (groupPlan == null) {
throw new MSException(Translator.get("test_plan.group.error"));
}
//判断并未归档