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

fix(测试跟踪): 修改测试计划实时报告搜索性能测试资源池取值错误的问题 

--bug=1024600 --user=宋天阳 【测试跟踪】测试计划-性能用例-修改配置修改资源池后未按修改的资源池执行
https://www.tapd.cn/55049933/s/1352662
This commit is contained in:
song-tianyang 2023-03-20 10:49:16 +08:00 committed by 建国
parent 281d52b821
commit 9694ad7768
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanLoadCaseMapper.xml
View File

@ -372,16 +372,14 @@
<select id="getResourcePoolByPlanId" resultType="java.lang.String"> <select id="getResourcePoolByPlanId" resultType="java.lang.String">
SELECT ltr.test_resource_pool_id SELECT ltr.test_resource_pool_id
FROM test_plan_load_case tplc FROM test_plan_load_case tplc
INNER JOIN load_test_report ltr INNER JOIN load_test_report ltr ON tplc.load_report_id = ltr.id
ON tplc.load_case_id = ltr.test_id
WHERE tplc.test_plan_id = #{0} WHERE tplc.test_plan_id = #{0}
</select> </select>
<select id="getCaseResourcePoolByPlanId" resultType="java.lang.String"> <select id="getCaseResourcePoolByPlanId" resultType="java.lang.String">
SELECT lt.test_resource_pool_id
SELECT tplc.test_resource_pool_id
FROM test_plan_load_case tplc FROM test_plan_load_case tplc
INNER JOIN load_test lt WHERE tplc.test_plan_id = #{0};
ON tplc.load_case_id = lt.id
WHERE tplc.test_plan_id = #{0}
</select> </select>
</mapper> </mapper>

2
performance-test/backend/src/main/java/io/metersphere/plan/controller/TestPlanLoadCaseController.java
View File

@ -181,7 +181,7 @@ public class TestPlanLoadCaseController {
@GetMapping("/resource/pool/{planId}") @GetMapping("/resource/pool/{planId}")
public List<String> getResourcePoolByPlanId(@PathVariable String planId) { public List<String> getResourcePoolByPlanId(@PathVariable String planId) {
return testPlanLoadCaseService.getResourcePoolByPlanId(planId); return testPlanLoadCaseService.getResourcePoolFromReportByPlanId(planId);
} }
@GetMapping("/resource/pool/case/{planId}") @GetMapping("/resource/pool/case/{planId}")

2
performance-test/backend/src/main/java/io/metersphere/plan/service/TestPlanLoadCaseService.java
View File

@ -713,7 +713,7 @@ public class TestPlanLoadCaseService {
.collect(Collectors.toList()).isEmpty(); .collect(Collectors.toList()).isEmpty();
} }
public List<String> getResourcePoolByPlanId(String planId) { public List<String> getResourcePoolFromReportByPlanId(String planId) {
return extTestPlanLoadCaseMapper.getResourcePoolByPlanId(planId); return extTestPlanLoadCaseMapper.getResourcePoolByPlanId(planId);
} }