diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java index 8d199b08080bddfbb47dd0db291bd87ae7e4da37..5332c337b73ab4a2b4fdb03d0f2f08d73e8e159c 100644 --- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java +++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java @@ -102,16 +102,8 @@ public class PerformanceTestService { if (!loadTestReports.isEmpty()) { List reportIdList = loadTestReports.stream().map(LoadTestReport::getId).collect(Collectors.toList()); - // delete load_test_report_result - LoadTestReportResultExample loadTestReportResultExample = new LoadTestReportResultExample(); - loadTestReportResultExample.createCriteria().andReportIdIn(reportIdList); - loadTestReportResultMapper.deleteByExample(loadTestReportResultExample); - - // delete load_test_report, delete load_test_report_detail + // delete load_test_report reportIdList.forEach(reportId -> { - LoadTestReportDetailExample example = new LoadTestReportDetailExample(); - example.createCriteria().andReportIdEqualTo(reportId); - loadTestReportDetailMapper.deleteByExample(example); reportService.deleteReport(reportId); }); } diff --git a/backend/src/main/java/io/metersphere/performance/service/ReportService.java b/backend/src/main/java/io/metersphere/performance/service/ReportService.java index 5f3e3a66ad431ca88ccf6fb7befaa47e39b42e49..50bcc908fcca04fd9a40a01833204505529303c8 100644 --- a/backend/src/main/java/io/metersphere/performance/service/ReportService.java +++ b/backend/src/main/java/io/metersphere/performance/service/ReportService.java @@ -3,10 +3,7 @@ package io.metersphere.performance.service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import io.metersphere.base.domain.*; -import io.metersphere.base.mapper.LoadTestMapper; -import io.metersphere.base.mapper.LoadTestReportLogMapper; -import io.metersphere.base.mapper.LoadTestReportMapper; -import io.metersphere.base.mapper.LoadTestReportResultMapper; +import io.metersphere.base.mapper.*; import io.metersphere.base.mapper.ext.ExtLoadTestReportMapper; import io.metersphere.commons.constants.PerformanceTestStatus; import io.metersphere.commons.constants.ReportKeys; @@ -45,6 +42,8 @@ public class ReportService { private LoadTestReportLogMapper loadTestReportLogMapper; @Resource private TestResourceService testResourceService; + @Resource + private LoadTestReportDetailMapper loadTestReportDetailMapper; public List getRecentReportList(ReportRequest request) { List orders = new ArrayList<>(); @@ -85,6 +84,16 @@ public class ReportService { stopEngine(loadTest, engine); } + // delete load_test_report_result + LoadTestReportResultExample loadTestReportResultExample = new LoadTestReportResultExample(); + loadTestReportResultExample.createCriteria().andReportIdEqualTo(reportId); + loadTestReportResultMapper.deleteByExample(loadTestReportResultExample); + + // delete load_test_report_detail + LoadTestReportDetailExample example = new LoadTestReportDetailExample(); + example.createCriteria().andReportIdEqualTo(reportId); + loadTestReportDetailMapper.deleteByExample(example); + loadTestReportMapper.deleteByPrimaryKey(reportId); }