Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/api/controller/APIScenarioReportController.java

@@ -44,9 +44,9 @@ public class APIScenarioReportController {
 
     @PostMapping("/add")
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
-    public String add(@RequestBody APIScenarioReportResult node) {
+    public void add(@RequestBody APIScenarioReportResult node) {
         node.setExecuteType(ExecuteType.Saved.name());
-        return apiReportService.save(node, ApiRunMode.SCENARIO.name());
+        apiReportService.save(node, ApiRunMode.SCENARIO.name());
     }
 
     @PostMapping("/update")

backend/src/main/java/io/metersphere/api/dto/datacount/response/ApiDataCountDTO.java

@@ -188,11 +188,11 @@ public class ApiDataCountDTO {
         for (ApiDataCountResult countResult : allExecuteResult) {
             if("Success".equals(countResult.getGroupField())){
                 this.successCount+= countResult.getCountNumber();
-            }else if("Error".equals(countResult.getGroupField())){
+                this.executedCount+= countResult.getCountNumber();
+            }else if("Error".equals(countResult.getGroupField())||"Fail".equals(countResult.getGroupField())){
                 this.failedCount+= countResult.getCountNumber();
+                this.executedCount+= countResult.getCountNumber();
             }
-
-            this.executedCount+= countResult.getCountNumber();
         }
     }
 }

backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java

@@ -21,7 +21,6 @@ import org.apache.jmeter.protocol.http.sampler.HTTPSampleResult;
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.visualizers.backend.AbstractBackendListenerClient;
 import org.apache.jmeter.visualizers.backend.BackendListenerContext;
-import org.python.antlr.ast.Str;
 import org.springframework.http.HttpMethod;
 
 import java.io.ByteArrayOutputStream;
@@ -179,28 +178,31 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
             testResult.setTestId(testId);
             ApiScenarioReport scenarioReport = apiScenarioReportService.complete(testResult, this.runMode);
 
-
             report = new ApiTestReport();
             report.setStatus(scenarioReport.getStatus());
             report.setId(scenarioReport.getId());
             report.setTriggerMode(scenarioReport.getTriggerMode());
             report.setName(scenarioReport.getName());
 
-
             SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
             assert systemParameterService != null;
             BaseSystemConfigDTO baseSystemConfigDTO = systemParameterService.getBaseInfo();
             reportUrl = baseSystemConfigDTO.getUrl() + "/#/api/automation/report";
 
-
+            String scenaName = scenarioReport.getName();
-            String  scenaName = scenarioReport.getName();
+            if (scenaName == null) {
-            if(scenaName==null){
                 scenaName = "";
-            }else {
+            } else {
-                scenaName = scenaName.split("-")[0];
+                String[] sceneNameArr = scenaName.split("-");
+                if (sceneNameArr.length >= 4) {
+                    String endStr = "-" + sceneNameArr[sceneNameArr.length - 3] + "-" + sceneNameArr[sceneNameArr.length - 2] + "-" + sceneNameArr[sceneNameArr.length - 1];
+                    scenaName = scenaName.split(endStr)[0];
+                } else {
+                    scenaName = scenaName.split("-")[0];
+                }
             }
 
-            String scenarioID = apiScenarioReportService.getApiScenarioId(scenaName,scenarioReport.getProjectId());
+            String scenarioID = apiScenarioReportService.getApiScenarioId(scenaName, scenarioReport.getProjectId());
             testResult.setTestId(scenarioID);
         } else {
             apiTestService.changeStatus(testId, APITestStatus.Completed);
@@ -224,14 +226,14 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
             }
         }
         try {
-            sendTask(report,reportUrl, testResult);
+            sendTask(report, reportUrl, testResult);
         } catch (Exception e) {
             LogUtil.error(e.getMessage(), e);
         }
 
     }
 
-    private static void sendTask(ApiTestReport report,String reportUrl, TestResult testResult) {
+    private static void sendTask(ApiTestReport report, String reportUrl, TestResult testResult) {
         SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
         NoticeSendService noticeSendService = CommonBeanFactory.getBean(NoticeSendService.class);
         assert systemParameterService != null;
@@ -239,7 +241,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
 
         BaseSystemConfigDTO baseSystemConfigDTO = systemParameterService.getBaseInfo();
         String url = reportUrl;
-        if(StringUtils.isEmpty(url)){
+        if (StringUtils.isEmpty(url)) {
             url = baseSystemConfigDTO.getUrl() + "/#/api/report/view/" + report.getId();
         }
         String successContext = "";
@@ -267,6 +269,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         paramMap.put("id", report.getId());
         paramMap.put("type", "performance");
         paramMap.put("url", baseSystemConfigDTO.getUrl());
+        paramMap.put("status", report.getStatus());
         NoticeModel noticeModel = NoticeModel.builder()
                 .successContext(successContext)
                 .successMailTemplate("ApiSuccessfulNotification")

backend/src/main/java/io/metersphere/api/jmeter/TestResult.java

@@ -20,7 +20,7 @@ public class TestResult {
 
     private int passAssertions = 0;
 
-    private final List<ScenarioResult> scenarios = new ArrayList<>();
+    private List<ScenarioResult> scenarios = new ArrayList<>();
 
     public void addError(int count) {
         this.error += count;

backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.metersphere.api.dto.DeleteAPIReportRequest;
 import io.metersphere.api.dto.automation.*;
 import io.metersphere.api.dto.datacount.ApiDataCountResult;
 import io.metersphere.api.dto.definition.RunDefinitionRequest;
@@ -14,6 +15,7 @@ import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
 import io.metersphere.api.jmeter.JMeterService;
 import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.ApiScenarioMapper;
+import io.metersphere.base.mapper.ApiScenarioReportMapper;
 import io.metersphere.base.mapper.TestPlanApiScenarioMapper;
 import io.metersphere.base.mapper.ext.ExtApiScenarioMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanApiCaseMapper;
@@ -37,13 +39,13 @@ import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.jorphan.collections.HashTree;
 import org.apache.jorphan.collections.ListedHashTree;
-import org.python.antlr.ast.Str;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -68,6 +70,8 @@ public class ApiAutomationService {
     private ExtTestPlanMapper extTestPlanMapper;
     @Resource
     SqlSessionFactory sqlSessionFactory;
+    @Resource
+    private ApiScenarioReportMapper apiScenarioReportMapper;
 
     public List<ApiScenarioDTO> list(ApiScenarioRequest request) {
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
@@ -157,6 +161,10 @@ public class ApiAutomationService {
     }
 
     public void preDelete(String scenarioID) {
+        ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample();
+        scenarioReportExample.createCriteria().andScenarioIdEqualTo(scenarioID);
+        List<ApiScenarioReport> list = apiScenarioReportMapper.selectByExample(scenarioReportExample);
+        deleteApiScenarioReport(list);
         scheduleService.deleteByResourceId(scenarioID);
 
         TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
@@ -177,9 +185,21 @@ public class ApiAutomationService {
 
     }
 
-    public void preDelete(List<String> scenarioIDList) {
+    private void deleteApiScenarioReport(List<ApiScenarioReport> list) {
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<String> ids = list.stream().map(ApiScenarioReport::getId).collect(Collectors.toList());
+            DeleteAPIReportRequest reportRequest = new DeleteAPIReportRequest();
+            reportRequest.setIds(ids);
+            apiReportService.deleteAPIReportBatch(reportRequest);
+        }
+    }
+
+    public void preDeleteBatch(List<String> scenarioIDList) {
+        ApiScenarioReportExample scenarioReportExample = new ApiScenarioReportExample();
+        scenarioReportExample.createCriteria().andScenarioIdIn(scenarioIDList);
+        List<ApiScenarioReport> list = apiScenarioReportMapper.selectByExample(scenarioReportExample);
+        deleteApiScenarioReport(list);
         List<String> testPlanApiScenarioIdList = new ArrayList<>();
-        List<String> scheduleIdList = new ArrayList<>();
         for (String id : scenarioIDList) {
             TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
             example.createCriteria().andApiScenarioIdEqualTo(id);
@@ -201,9 +221,8 @@ public class ApiAutomationService {
     }
 
     public void deleteBatch(List<String> ids) {
-        //及连删除外键表
+        // 删除外键表
-        preDelete(ids);
+        preDeleteBatch(ids);
-        ;
         ApiScenarioExample example = new ApiScenarioExample();
         example.createCriteria().andIdIn(ids);
         apiScenarioMapper.deleteByExample(example);
@@ -388,40 +407,7 @@ public class ApiAutomationService {
                     apiCaseBatchMapper.insertIfNotExists(testPlanApiCase);
                 }
             }
-
         }
-//        testPlan的ID先不存储
-//        list.forEach(item -> {
-//            if (CollectionUtils.isNotEmpty(request.getApiIds())) {
-//                if (CollectionUtils.isNotEmpty(request.getApiIds())) {
-//                    if (StringUtils.isEmpty(item.getApiIds())) {
-//                        item.setApiIds(JSON.toJSONString(request.getApiIds()));
-//                    } else {
-//                        // 合并api
-//                        List<String> dbApiIDs = JSON.parseArray(item.getApiIds(), String.class);
-//                        List<String> result = Stream.of(request.getApiIds(), dbApiIDs)
-//                                .flatMap(Collection::stream).distinct().collect(Collectors.toList());
-//                        item.setApiIds(JSON.toJSONString(result));
-//                    }
-//                    item.setScenarioIds(null);
-//                }
-//            }
-//            if (CollectionUtils.isNotEmpty(request.getScenarioIds())) {
-//                if (CollectionUtils.isNotEmpty(request.getScenarioIds())) {
-//                    if (StringUtils.isEmpty(item.getScenarioIds())) {
-//                        item.setScenarioIds(JSON.toJSONString(request.getScenarioIds()));
-//                    } else {
-//                        // 合并场景ID
-//                        List<String> dbScenarioIDs = JSON.parseArray(item.getScenarioIds(), String.class);
-//                        List<String> result = Stream.of(request.getScenarioIds(), dbScenarioIDs)
-//                                .flatMap(Collection::stream).distinct().collect(Collectors.toList());
-//                        item.setScenarioIds(JSON.toJSONString(result));
-//                    }
-//                    item.setApiIds(null);
-//                }
-//            }
-//            mapper.updatePlan(item);
-//        });
         sqlSession.flushStatements();
         return "success";
     }
@@ -432,10 +418,8 @@ public class ApiAutomationService {
 
     public long countScenarioByProjectIDAndCreatInThisWeek(String projectId) {
         Map<String, Date> startAndEndDateInWeek = DateUtils.getWeedFirstTimeAndLastTime(new Date());
-
         Date firstTime = startAndEndDateInWeek.get("firstTime");
         Date lastTime = startAndEndDateInWeek.get("lastTime");
-
         if (firstTime == null || lastTime == null) {
             return 0;
         } else {

backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java

@@ -91,6 +91,7 @@ public class ApiScenarioReportService {
         }
         report.setContent(new String(detail.getContent(), StandardCharsets.UTF_8));
         this.save(report, runMode);
+        // 此方法适用于前端发起
         if (!report.getTriggerMode().equals(ReportTriggerMode.SCHEDULE.name())) {
             cache.put(report.getId(), report);
         }
@@ -141,19 +142,21 @@ public class ApiScenarioReportService {
         }
     }
 
-    public ApiScenarioReport createReport(APIScenarioReportResult test) {
+    public ApiScenarioReport createReport(APIScenarioReportResult test, String scenarioName, String scenarioId, String result) {
         checkNameExist(test);
         ApiScenarioReport report = new ApiScenarioReport();
         report.setId(UUID.randomUUID().toString());
         report.setProjectId(test.getProjectId());
-        report.setName(test.getName());
+        report.setName(scenarioName + "-" + DateUtils.getTimeStr(System.currentTimeMillis()));
         report.setTriggerMode(test.getTriggerMode());
         report.setDescription(test.getDescription());
         report.setCreateTime(System.currentTimeMillis());
         report.setUpdateTime(System.currentTimeMillis());
-        report.setStatus(test.getStatus());
+        report.setStatus(result);
         report.setUserId(test.getUserId());
         report.setExecuteType(test.getExecuteType());
+        report.setScenarioId(scenarioId);
+        report.setScenarioName(scenarioName);
         apiScenarioReportMapper.insert(report);
         return report;
     }
@@ -171,33 +174,37 @@ public class ApiScenarioReportService {
         report.setStatus(test.getStatus());
         report.setUserId(test.getUserId());
         report.setExecuteType(test.getExecuteType());
+        report.setScenarioId(test.getScenarioId());
+        report.setScenarioName(test.getScenarioName());
         apiScenarioReportMapper.updateByPrimaryKey(report);
         return report;
     }
 
+    private TestResult createTestResult(TestResult result) {
+        TestResult newrResult = new TestResult();
+        newrResult.setTestId(result.getTestId());
+        newrResult.setTotal(result.getTotal());
+        newrResult.setError(result.getError());
+        newrResult.setPassAssertions(result.getPassAssertions());
+        newrResult.setSuccess(result.getSuccess());
+        newrResult.setTotalAssertions(result.getTotalAssertions());
+        return newrResult;
+    }
 
-    public String save(APIScenarioReportResult test, String runModel) {
+    public void save(APIScenarioReportResult test, String runModel) {
-        ApiScenarioReport report = createReport(test);
-        ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
         TestResult result = JSON.parseObject(test.getContent(), TestResult.class);
         // 更新场景
         if (result != null) {
             if (StringUtils.equals(runModel, ApiRunMode.SCENARIO_PLAN.name())) {
-                updatePlanCase(result, test, report);
+                updatePlanCase(result, test);
             } else {
-                updateScenario(result.getScenarios(), test.getProjectId(), report.getId());
+                updateScenario(test, result);
             }
         }
-        detail.setContent(test.getContent().getBytes(StandardCharsets.UTF_8));
-        detail.setReportId(report.getId());
-        detail.setProjectId(test.getProjectId());
-        apiScenarioReportDetailMapper.insert(detail);
-        return report.getId();
     }
 
-    public void updatePlanCase(TestResult result, APIScenarioReportResult test, ApiScenarioReport report) {
+    public void updatePlanCase(TestResult result, APIScenarioReportResult test) {
-        TestPlanApiScenario testPlanApiScenario = new TestPlanApiScenario();
+        TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(test.getId());
-        testPlanApiScenario.setId(test.getId());
         ScenarioResult scenarioResult = result.getScenarios().get(0);
         if (scenarioResult.getError() > 0) {
             testPlanApiScenario.setLastResult("Fail");
@@ -206,14 +213,27 @@ public class ApiScenarioReportService {
         }
         String passRate = new DecimalFormat("0%").format((float) scenarioResult.getSuccess() / (scenarioResult.getSuccess() + scenarioResult.getError()));
         testPlanApiScenario.setPassRate(passRate);
+        // 存储场景报告
+        ApiScenarioReport report = createReport(test, scenarioResult.getName(), testPlanApiScenario.getApiScenarioId(), scenarioResult.getError() == 0 ? "Success" : "Error");
+        // 报告详情内容
+        ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
+        TestResult newResult = createTestResult(result);
+        List<ScenarioResult> scenarioResults = new ArrayList();
+        scenarioResults.add(scenarioResult);
+        newResult.setScenarios(scenarioResults);
+        detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
+        detail.setReportId(report.getId());
+        detail.setProjectId(test.getProjectId());
+        apiScenarioReportDetailMapper.insert(detail);
+
         testPlanApiScenario.setReportId(report.getId());
         testPlanApiScenarioMapper.updateByPrimaryKeySelective(testPlanApiScenario);
     }
 
-    public void updateScenario(List<ScenarioResult> Scenarios, String projectId, String reportId) {
+    public void updateScenario(APIScenarioReportResult test, TestResult result) {
-        Scenarios.forEach(item -> {
+        result.getScenarios().forEach(item -> {
             ApiScenarioExample example = new ApiScenarioExample();
-            example.createCriteria().andNameEqualTo(item.getName()).andProjectIdEqualTo(projectId);
+            example.createCriteria().andNameEqualTo(item.getName()).andProjectIdEqualTo(test.getProjectId());
             List<ApiScenario> list = apiScenarioMapper.selectByExample(example);
             if (list.size() > 0) {
                 ApiScenario scenario = list.get(0);
@@ -224,7 +244,21 @@ public class ApiScenarioReportService {
                 }
                 String passRate = new DecimalFormat("0%").format((float) item.getSuccess() / (item.getSuccess() + item.getError()));
                 scenario.setPassRate(passRate);
-                scenario.setReportId(reportId);
+
+                // 存储场景报告
+                ApiScenarioReport report = createReport(test, scenario.getName(), scenario.getId(), scenario.getLastResult());
+                // 报告详情内容
+                ApiScenarioReportDetail detail = new ApiScenarioReportDetail();
+                TestResult newResult = createTestResult(result);
+                List<ScenarioResult> scenarioResults = new ArrayList();
+                scenarioResults.add(item);
+                newResult.setScenarios(scenarioResults);
+                detail.setContent(JSON.toJSONString(newResult).getBytes(StandardCharsets.UTF_8));
+                detail.setReportId(report.getId());
+                detail.setProjectId(scenario.getProjectId());
+                apiScenarioReportDetailMapper.insert(detail);
+                // 更新场景状态
+                scenario.setReportId(report.getId());
                 apiScenarioMapper.updateByPrimaryKey(scenario);
             }
         });

backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java

@@ -105,7 +105,6 @@ public class ApiTestCaseService {
     public void update(SaveApiTestCaseRequest request, List<MultipartFile> bodyFiles) {
 
         deleteFileByTestId(request.getId());
-
         List<String> bodyUploadIds = new ArrayList<>(request.getBodyUploadIds());
         request.setBodyUploadIds(null);
         ApiTestCase test = updateTest(request);
@@ -134,12 +133,9 @@ public class ApiTestCaseService {
     }
 
     public void delete(String testId) {
-
         extTestPlanTestCaseMapper.deleteByTestCaseID(testId);
-
         deleteFileByTestId(testId);
         extApiDefinitionExecResultMapper.deleteByResourceId(testId);
-
         apiTestCaseMapper.deleteByPrimaryKey(testId);
         deleteBodyFiles(testId);
     }

backend/src/main/java/io/metersphere/base/domain/ApiScenarioReport.java

@@ -24,6 +24,10 @@ public class ApiScenarioReport implements Serializable {
 
     private String executeType;
 
+    private String scenarioName;
+
+    private String scenarioId;
+
     private String description;
 
     private static final long serialVersionUID = 1L;

backend/src/main/java/io/metersphere/base/domain/ApiScenarioReportExample.java

@@ -713,6 +713,146 @@ public class ApiScenarioReportExample {
             addCriterion("execute_type not between", value1, value2, "executeType");
             return (Criteria) this;
         }
+
+        public Criteria andScenarioNameIsNull() {
+            addCriterion("scenario_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameIsNotNull() {
+            addCriterion("scenario_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameEqualTo(String value) {
+            addCriterion("scenario_name =", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameNotEqualTo(String value) {
+            addCriterion("scenario_name <>", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameGreaterThan(String value) {
+            addCriterion("scenario_name >", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameGreaterThanOrEqualTo(String value) {
+            addCriterion("scenario_name >=", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameLessThan(String value) {
+            addCriterion("scenario_name <", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameLessThanOrEqualTo(String value) {
+            addCriterion("scenario_name <=", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameLike(String value) {
+            addCriterion("scenario_name like", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameNotLike(String value) {
+            addCriterion("scenario_name not like", value, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameIn(List<String> values) {
+            addCriterion("scenario_name in", values, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameNotIn(List<String> values) {
+            addCriterion("scenario_name not in", values, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameBetween(String value1, String value2) {
+            addCriterion("scenario_name between", value1, value2, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioNameNotBetween(String value1, String value2) {
+            addCriterion("scenario_name not between", value1, value2, "scenarioName");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdIsNull() {
+            addCriterion("scenario_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdIsNotNull() {
+            addCriterion("scenario_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdEqualTo(String value) {
+            addCriterion("scenario_id =", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdNotEqualTo(String value) {
+            addCriterion("scenario_id <>", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdGreaterThan(String value) {
+            addCriterion("scenario_id >", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdGreaterThanOrEqualTo(String value) {
+            addCriterion("scenario_id >=", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdLessThan(String value) {
+            addCriterion("scenario_id <", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdLessThanOrEqualTo(String value) {
+            addCriterion("scenario_id <=", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdLike(String value) {
+            addCriterion("scenario_id like", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdNotLike(String value) {
+            addCriterion("scenario_id not like", value, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdIn(List<String> values) {
+            addCriterion("scenario_id in", values, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdNotIn(List<String> values) {
+            addCriterion("scenario_id not in", values, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdBetween(String value1, String value2) {
+            addCriterion("scenario_id between", value1, value2, "scenarioId");
+            return (Criteria) this;
+        }
+
+        public Criteria andScenarioIdNotBetween(String value1, String value2) {
+            addCriterion("scenario_id not between", value1, value2, "scenarioId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/metersphere/base/domain/TestPlan.java

@@ -1,8 +1,9 @@
 package io.metersphere.base.domain;
 
-import java.io.Serializable;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
 public class TestPlan implements Serializable {
     private String id;
@@ -39,10 +40,6 @@ public class TestPlan implements Serializable {
 
     private String creator;
 
-    private String apiIds;
-
-    private String scenarioIds;
-
     private String tags;
 
     private static final long serialVersionUID = 1L;

backend/src/main/java/io/metersphere/base/domain/TestPlanExample.java

@@ -1233,146 +1233,6 @@ public class TestPlanExample {
             addCriterion("creator not between", value1, value2, "creator");
             return (Criteria) this;
         }
-
-        public Criteria andApiIdsIsNull() {
-            addCriterion("api_ids is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsIsNotNull() {
-            addCriterion("api_ids is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsEqualTo(String value) {
-            addCriterion("api_ids =", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsNotEqualTo(String value) {
-            addCriterion("api_ids <>", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsGreaterThan(String value) {
-            addCriterion("api_ids >", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsGreaterThanOrEqualTo(String value) {
-            addCriterion("api_ids >=", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsLessThan(String value) {
-            addCriterion("api_ids <", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsLessThanOrEqualTo(String value) {
-            addCriterion("api_ids <=", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsLike(String value) {
-            addCriterion("api_ids like", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsNotLike(String value) {
-            addCriterion("api_ids not like", value, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsIn(List<String> values) {
-            addCriterion("api_ids in", values, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsNotIn(List<String> values) {
-            addCriterion("api_ids not in", values, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsBetween(String value1, String value2) {
-            addCriterion("api_ids between", value1, value2, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andApiIdsNotBetween(String value1, String value2) {
-            addCriterion("api_ids not between", value1, value2, "apiIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsIsNull() {
-            addCriterion("scenario_ids is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsIsNotNull() {
-            addCriterion("scenario_ids is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsEqualTo(String value) {
-            addCriterion("scenario_ids =", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsNotEqualTo(String value) {
-            addCriterion("scenario_ids <>", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsGreaterThan(String value) {
-            addCriterion("scenario_ids >", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsGreaterThanOrEqualTo(String value) {
-            addCriterion("scenario_ids >=", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsLessThan(String value) {
-            addCriterion("scenario_ids <", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsLessThanOrEqualTo(String value) {
-            addCriterion("scenario_ids <=", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsLike(String value) {
-            addCriterion("scenario_ids like", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsNotLike(String value) {
-            addCriterion("scenario_ids not like", value, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsIn(List<String> values) {
-            addCriterion("scenario_ids in", values, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsNotIn(List<String> values) {
-            addCriterion("scenario_ids not in", values, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsBetween(String value1, String value2) {
-            addCriterion("scenario_ids between", value1, value2, "scenarioIds");
-            return (Criteria) this;
-        }
-
-        public Criteria andScenarioIdsNotBetween(String value1, String value2) {
-            addCriterion("scenario_ids not between", value1, value2, "scenarioIds");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportMapper.java

@@ -2,9 +2,8 @@ package io.metersphere.base.mapper;
 
 import io.metersphere.base.domain.ApiScenarioReport;
 import io.metersphere.base.domain.ApiScenarioReportExample;
-import org.apache.ibatis.annotations.Param;
-
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 public interface ApiScenarioReportMapper {
     long countByExample(ApiScenarioReportExample example);

backend/src/main/java/io/metersphere/base/mapper/ApiScenarioReportMapper.xml

@@ -11,6 +11,8 @@
     <result column="user_id" jdbcType="VARCHAR" property="userId" />
     <result column="trigger_mode" jdbcType="VARCHAR" property="triggerMode" />
     <result column="execute_type" jdbcType="VARCHAR" property="executeType" />
+    <result column="scenario_name" jdbcType="VARCHAR" property="scenarioName" />
+    <result column="scenario_id" jdbcType="VARCHAR" property="scenarioId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.ApiScenarioReport">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -75,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, project_id, `name`, create_time, update_time, `status`, user_id, trigger_mode, 
-    execute_type
+    execute_type, scenario_name, scenario_id
   </sql>
   <sql id="Blob_Column_List">
     description
@@ -132,11 +134,13 @@
     insert into api_scenario_report (id, project_id, `name`, 
       create_time, update_time, `status`, 
       user_id, trigger_mode, execute_type, 
-      description)
+      scenario_name, scenario_id, description
+      )
     values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, 
       #{userId,jdbcType=VARCHAR}, #{triggerMode,jdbcType=VARCHAR}, #{executeType,jdbcType=VARCHAR}, 
-      #{description,jdbcType=LONGVARCHAR})
+      #{scenarioName,jdbcType=VARCHAR}, #{scenarioId,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.ApiScenarioReport">
     insert into api_scenario_report
@@ -168,6 +172,12 @@
       <if test="executeType != null">
         execute_type,
       </if>
+      <if test="scenarioName != null">
+        scenario_name,
+      </if>
+      <if test="scenarioId != null">
+        scenario_id,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -200,6 +210,12 @@
       <if test="executeType != null">
         #{executeType,jdbcType=VARCHAR},
       </if>
+      <if test="scenarioName != null">
+        #{scenarioName,jdbcType=VARCHAR},
+      </if>
+      <if test="scenarioId != null">
+        #{scenarioId,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -241,6 +257,12 @@
       <if test="record.executeType != null">
         execute_type = #{record.executeType,jdbcType=VARCHAR},
       </if>
+      <if test="record.scenarioName != null">
+        scenario_name = #{record.scenarioName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.scenarioId != null">
+        scenario_id = #{record.scenarioId,jdbcType=VARCHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -260,6 +282,8 @@
       user_id = #{record.userId,jdbcType=VARCHAR},
       trigger_mode = #{record.triggerMode,jdbcType=VARCHAR},
       execute_type = #{record.executeType,jdbcType=VARCHAR},
+      scenario_name = #{record.scenarioName,jdbcType=VARCHAR},
+      scenario_id = #{record.scenarioId,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -275,7 +299,9 @@
       `status` = #{record.status,jdbcType=VARCHAR},
       user_id = #{record.userId,jdbcType=VARCHAR},
       trigger_mode = #{record.triggerMode,jdbcType=VARCHAR},
-      execute_type = #{record.executeType,jdbcType=VARCHAR}
+      execute_type = #{record.executeType,jdbcType=VARCHAR},
+      scenario_name = #{record.scenarioName,jdbcType=VARCHAR},
+      scenario_id = #{record.scenarioId,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -307,6 +333,12 @@
       <if test="executeType != null">
         execute_type = #{executeType,jdbcType=VARCHAR},
       </if>
+      <if test="scenarioName != null">
+        scenario_name = #{scenarioName,jdbcType=VARCHAR},
+      </if>
+      <if test="scenarioId != null">
+        scenario_id = #{scenarioId,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -323,6 +355,8 @@
       user_id = #{userId,jdbcType=VARCHAR},
       trigger_mode = #{triggerMode,jdbcType=VARCHAR},
       execute_type = #{executeType,jdbcType=VARCHAR},
+      scenario_name = #{scenarioName,jdbcType=VARCHAR},
+      scenario_id = #{scenarioId,jdbcType=VARCHAR},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -335,7 +369,9 @@
       `status` = #{status,jdbcType=VARCHAR},
       user_id = #{userId,jdbcType=VARCHAR},
       trigger_mode = #{triggerMode,jdbcType=VARCHAR},
-      execute_type = #{executeType,jdbcType=VARCHAR}
+      execute_type = #{executeType,jdbcType=VARCHAR},
+      scenario_name = #{scenarioName,jdbcType=VARCHAR},
+      scenario_id = #{scenarioId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/src/main/java/io/metersphere/base/mapper/TestPlanMapper.xml

@@ -19,8 +19,6 @@
     <result column="planned_end_time" jdbcType="BIGINT" property="plannedEndTime" />
     <result column="actual_start_time" jdbcType="BIGINT" property="actualStartTime" />
     <result column="creator" jdbcType="VARCHAR" property="creator" />
-    <result column="api_ids" jdbcType="VARCHAR" property="apiIds" />
-    <result column="scenario_ids" jdbcType="VARCHAR" property="scenarioIds" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.metersphere.base.domain.TestPlan">
     <result column="tags" jdbcType="LONGVARCHAR" property="tags" />
@@ -86,7 +84,7 @@
   <sql id="Base_Column_List">
     id, workspace_id, report_id, `name`, description, `status`, stage, principal, test_case_match_rule, 
     executor_match_rule, create_time, update_time, actual_end_time, planned_start_time, 
-    planned_end_time, actual_start_time, creator, api_ids, scenario_ids
+    planned_end_time, actual_start_time, creator
   </sql>
   <sql id="Blob_Column_List">
     tags
@@ -145,15 +143,15 @@
       stage, principal, test_case_match_rule, 
       executor_match_rule, create_time, update_time, 
       actual_end_time, planned_start_time, planned_end_time, 
-      actual_start_time, creator, api_ids, 
+      actual_start_time, creator, tags
-      scenario_ids, tags)
+      )
     values (#{id,jdbcType=VARCHAR}, #{workspaceId,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
       #{stage,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{testCaseMatchRule,jdbcType=VARCHAR}, 
       #{executorMatchRule,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
       #{actualEndTime,jdbcType=BIGINT}, #{plannedStartTime,jdbcType=BIGINT}, #{plannedEndTime,jdbcType=BIGINT}, 
-      #{actualStartTime,jdbcType=BIGINT}, #{creator,jdbcType=VARCHAR}, #{apiIds,jdbcType=VARCHAR}, 
+      #{actualStartTime,jdbcType=BIGINT}, #{creator,jdbcType=VARCHAR}, #{tags,jdbcType=LONGVARCHAR}
-      #{scenarioIds,jdbcType=VARCHAR}, #{tags,jdbcType=LONGVARCHAR})
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.metersphere.base.domain.TestPlan">
     insert into test_plan
@@ -209,12 +207,6 @@
       <if test="creator != null">
         creator,
       </if>
-      <if test="apiIds != null">
-        api_ids,
-      </if>
-      <if test="scenarioIds != null">
-        scenario_ids,
-      </if>
       <if test="tags != null">
         tags,
       </if>
@@ -271,12 +263,6 @@
       <if test="creator != null">
         #{creator,jdbcType=VARCHAR},
       </if>
-      <if test="apiIds != null">
-        #{apiIds,jdbcType=VARCHAR},
-      </if>
-      <if test="scenarioIds != null">
-        #{scenarioIds,jdbcType=VARCHAR},
-      </if>
       <if test="tags != null">
         #{tags,jdbcType=LONGVARCHAR},
       </if>
@@ -342,12 +328,6 @@
       <if test="record.creator != null">
         creator = #{record.creator,jdbcType=VARCHAR},
       </if>
-      <if test="record.apiIds != null">
-        api_ids = #{record.apiIds,jdbcType=VARCHAR},
-      </if>
-      <if test="record.scenarioIds != null">
-        scenario_ids = #{record.scenarioIds,jdbcType=VARCHAR},
-      </if>
       <if test="record.tags != null">
         tags = #{record.tags,jdbcType=LONGVARCHAR},
       </if>
@@ -375,8 +355,6 @@
       planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
       actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
       creator = #{record.creator,jdbcType=VARCHAR},
-      api_ids = #{record.apiIds,jdbcType=VARCHAR},
-      scenario_ids = #{record.scenarioIds,jdbcType=VARCHAR},
       tags = #{record.tags,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -400,9 +378,7 @@
       planned_start_time = #{record.plannedStartTime,jdbcType=BIGINT},
       planned_end_time = #{record.plannedEndTime,jdbcType=BIGINT},
       actual_start_time = #{record.actualStartTime,jdbcType=BIGINT},
-      creator = #{record.creator,jdbcType=VARCHAR},
+      creator = #{record.creator,jdbcType=VARCHAR}
-      api_ids = #{record.apiIds,jdbcType=VARCHAR},
-      scenario_ids = #{record.scenarioIds,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -458,12 +434,6 @@
       <if test="creator != null">
         creator = #{creator,jdbcType=VARCHAR},
       </if>
-      <if test="apiIds != null">
-        api_ids = #{apiIds,jdbcType=VARCHAR},
-      </if>
-      <if test="scenarioIds != null">
-        scenario_ids = #{scenarioIds,jdbcType=VARCHAR},
-      </if>
       <if test="tags != null">
         tags = #{tags,jdbcType=LONGVARCHAR},
       </if>
@@ -488,8 +458,6 @@
       planned_end_time = #{plannedEndTime,jdbcType=BIGINT},
       actual_start_time = #{actualStartTime,jdbcType=BIGINT},
       creator = #{creator,jdbcType=VARCHAR},
-      api_ids = #{apiIds,jdbcType=VARCHAR},
-      scenario_ids = #{scenarioIds,jdbcType=VARCHAR},
       tags = #{tags,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -510,9 +478,7 @@
       planned_start_time = #{plannedStartTime,jdbcType=BIGINT},
       planned_end_time = #{plannedEndTime,jdbcType=BIGINT},
       actual_start_time = #{actualStartTime,jdbcType=BIGINT},
-      creator = #{creator,jdbcType=VARCHAR},
+      creator = #{creator,jdbcType=VARCHAR}
-      api_ids = #{apiIds,jdbcType=VARCHAR},
-      scenario_ids = #{scenarioIds,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml

@@ -53,7 +53,7 @@
             SELECT scene.`name` AS caseName,apiScene.testPlanName AS testPlan,count(report.id) AS failureTimes,'scenario' AS caseType
             FROM api_scenario_report report
                INNER JOIN api_scenario_report_detail reportDetail ON report.id = reportDetail.report_id
-               INNER JOIN api_scenario scene ON reportDetail.content like concat('%"', scene.`name`,'"%')
+               INNER JOIN api_scenario scene ON report.scenario_id = scene.id
                LEFT JOIN
                  (
                      SELECT

backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiScenarioReportMapper.xml

@@ -100,7 +100,7 @@
 
     <select id="list" resultMap="BaseResultMap">
         SELECT r.name AS test_name,
-        r.name, r.description, r.id, r.project_id, r.create_time, r.update_time, r.status, r.trigger_mode,
+        r.name, r.description, r.id, r.project_id, r.create_time, r.update_time, r.status, r.trigger_mode,r.scenario_name,
         project.name AS project_name, user.name AS user_name
         FROM api_scenario_report r
         LEFT JOIN project ON project.id = r.project_id
@@ -179,8 +179,8 @@
         SELECT count(acr.report_id) AS countNumber FROM api_scenario_report_detail acr
         INNER JOIN api_scenario_report ar ON ar.id = acr.report_id
         INNER JOIN (
-            SELECT acitem.`name` FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
+            SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
-        ) ac on acr.content like CONCAT('%"', ac.`name`,'"%')
+        ) ac on ar.scenario_id = ac.id
         WHERE acr.project_id = #{projectId} AND ar.create_time BETWEEN #{firstDayTimestamp} AND #{lastDayTimestamp}
     </select>
 
@@ -189,8 +189,8 @@
         FROM api_scenario_report_detail acr
         INNER JOIN api_scenario_report ar ON ar.id = acr.report_id
         INNER JOIN (
-        SELECT acitem.`name` FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
+        SELECT acitem.`name`,acitem.id FROM api_scenario acitem INNER JOIN `schedule` sc ON acitem.id = sc.resource_id
-        ) ac on acr.content like CONCAT('%"', ac.`name`,'"%')
+        ) ac on ar.scenario_id = ac.id
         WHERE acr.project_id = #{projectId}
     </select>
 </mapper>

backend/src/main/java/io/metersphere/base/mapper/ext/ExtScheduleMapper.xml

@@ -38,17 +38,17 @@
 
     <select id="countTaskByProjectId" resultType="java.lang.Long">
         SELECT COUNT(id) AS countNumber FROM `schedule` WHERE resource_id IN (
-            SELECT id FROM api_test WHERE project_id = #{0,jdbcType=VARCHAR}
+            SELECT id FROM api_test WHERE project_id = #{0,jdbcType=VARCHAR} AND status != 'Trash'
             UNION
-            SELECT id FROM api_scenario WHERE project_id = #{0,jdbcType=VARCHAR}
+            SELECT id FROM api_scenario WHERE project_id = #{0,jdbcType=VARCHAR} AND status != 'Trash'
             )
     </select>
     <select id="countTaskByProjectIdAndCreateTimeRange" resultType="java.lang.Long">
         SELECT COUNT(id) AS countNumber FROM `schedule`
         WHERE resource_id IN (
-            SELECT id FROM api_test WHERE project_id = #{projectId,jdbcType=VARCHAR}
+            SELECT id FROM api_test WHERE project_id = #{projectId,jdbcType=VARCHAR} AND status != 'Trash'
             UNION
-            SELECT id FROM api_scenario WHERE project_id = #{projectId,jdbcType=VARCHAR}
+            SELECT id FROM api_scenario WHERE project_id = #{projectId,jdbcType=VARCHAR} AND status != 'Trash'
         )
         AND create_time BETWEEN #{startTime} and #{endTime}
     </select>
@@ -61,8 +61,8 @@
         UNION
         SELECT apiScene.`name` AS scenario,sch.id AS taskID,sch.`value` AS rule,sch.`enable` AS `taskStatus`,u.`name` AS creator,sch.update_time AS updateTime
         FROM api_scenario apiScene
-                 INNER JOIN `schedule` sch ON apiScene.id = sch.resource_id
+         INNER JOIN `schedule` sch ON apiScene.id = sch.resource_id
-                 INNER JOIN `user` u ON u.id = sch.user_id
+         INNER JOIN `user` u ON u.id = sch.user_id
         WHERE sch.`enable` = true AND apiScene.project_id = #{0,jdbcType=VARCHAR}
     </select>
 </mapper>

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.java

@@ -17,12 +17,9 @@ public interface ExtTestPlanMapper {
 
     List<TestPlanDTO> selectByIds(@Param("list") List<String> ids);
 
-    int updatePlan(@Param("plan") TestPlanDTO plan);
-
-    List<TestPlanDTO> selectReference(@Param("request") QueryTestPlanRequest params);
-
     /**
      * 通过关联表(test_plan_api_case/test_plan_api_scenario)查询testPlan
+     *
      * @param params
      * @return
      */

backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml

@@ -182,21 +182,6 @@
         order by test_plan.update_time desc
     </select>
 
-    <update id="updatePlan" parameterType="io.metersphere.track.dto.TestPlanDTO">
-        update test_plan
-        <set>
-            <if test="plan.apiIds != null">
-                api_ids = #{plan.apiIds,jdbcType=VARCHAR}
-            </if>
-            <if test="plan.scenarioIds != null">
-                scenario_ids = #{plan.scenarioIds,jdbcType=VARCHAR}
-            </if>
-        </set>
-        <where>
-            id = #{plan.id}
-        </where>
-    </update>
-
     <select id="selectByIds" resultMap="BaseResultMap" parameterType="java.util.List">
         SELECT * FROM TEST_PLAN p where p.id in
         <foreach collection="list" item="planId" open="(" close=")" separator=",">
@@ -204,18 +189,6 @@
         </foreach>
     </select>
 
-    <select id="selectReference" resultMap="BaseResultMap" parameterType="io.metersphere.track.request.testcase.QueryTestPlanRequest">
-        SELECT * FROM TEST_PLAN p LEFT JOIN test_plan_project t ON t.test_plan_id=p.id
-        <where>
-            <if test="request.scenarioId != null">
-                AND p.scenario_ids like CONCAT('%', #{request.scenarioId},'%')
-            </if>
-            <if test="request.apiId != null">
-                AND p.api_ids like CONCAT('%', #{request.apiId},'%')
-            </if>
-        </where>
-    </select>
-
     <select id="checkIsHave" resultType="int">
         SELECT COUNT(1)
         FROM test_plan_project, project

backend/src/main/java/io/metersphere/commons/utils/DateUtils.java

@@ -41,6 +41,10 @@ public class DateUtils {
         return dateFormat.format(timeStamp);
     }
 
+    public static String getTimeStr(long timeStamp) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(TIME_PATTERN);
+        return dateFormat.format(timeStamp);
+    }
 
 
     public static Date dateSum (Date date,int countDays){

backend/src/main/java/io/metersphere/job/sechedule/ApiScenarioTestJob.java

@@ -55,7 +55,7 @@ public class ApiScenarioTestJob extends   MsScheduleJob {
         request.setReportId(id);
         request.setProjectId(projectID);
         request.setTriggerMode(ReportTriggerMode.SCHEDULE.name());
-        request.setExecuteType(ExecuteType.Completed.name());
+        request.setExecuteType(ExecuteType.Saved.name());
         request.setScenarioIds(this.scenarioIds);
         request.setReportUserID(this.userId);
 

backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java

@@ -87,6 +87,7 @@ public class PerformanceNoticeTask {
         paramMap.put("testName", loadTestReport.getName());
         paramMap.put("id", loadTestReport.getId());
         paramMap.put("type", "performance");
+        paramMap.put("status", loadTestReport.getStatus());
         paramMap.put("url", baseSystemConfigDTO.getUrl());
         NoticeModel noticeModel = NoticeModel.builder()
                 .successContext(successContext)

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f
+Subproject commit 79343a2763b014355f91fc21b2356a95ae437973

backend/src/main/resources/db/migration/V55__modify_api_scenario_report.sql

@@ -0,0 +1,4 @@
+ALTER TABLE api_scenario_report ADD scenario_name varchar(255) NULL;
+ALTER TABLE api_scenario_report ADD scenario_id varchar(100) NULL;
+ALTER TABLE test_plan DROP COLUMN api_ids;
+ALTER TABLE test_plan DROP COLUMN scenario_ids;

frontend/src/business/components/api/automation/report/ApiReportList.vue

@@ -20,10 +20,8 @@
           </el-table-column>
           <el-table-column :label="$t('commons.name')" width="200" show-overflow-tooltip prop="name">
           </el-table-column>
-<!--
+
-          <el-table-column prop="testName" :label="$t('api_report.test_name')" width="200" show-overflow-tooltip/>
+          <el-table-column prop="scenarioName" :label="$t('api_test.automation.scenario_name')" width="150" show-overflow-tooltip/>
--->
-          <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
           <el-table-column prop="userName" :label="$t('api_test.creator')" width="150" show-overflow-tooltip/>
           <el-table-column prop="createTime" width="250" :label="$t('commons.create_time')" sortable>
             <template v-slot:default="scope">
@@ -69,7 +67,7 @@
   import MsContainer from "../../../common/components/MsContainer";
   import MsMainContainer from "../../../common/components/MsMainContainer";
   import MsApiReportStatus from "./ApiReportStatus";
-  import {_filter, _sort,getCurrentProjectID} from "@/common/js/utils";
+  import {_filter, _sort, getCurrentProjectID} from "@/common/js/utils";
   import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
   import ReportTriggerModeItem from "../../../common/tableItem/ReportTriggerModeItem";
   import {REPORT_CONFIGS} from "../../../common/components/search/search-components";

frontend/src/business/components/api/automation/scenario/EditApiScenario.vue

@@ -202,9 +202,7 @@
         <ms-api-customize :request="customizeRequest" @addCustomizeApi="addCustomizeApi"/>
       </el-drawer>
       <!--场景导入 -->
-      <el-drawer :visible.sync="scenarioVisible" :destroy-on-close="true" direction="ltr" :withHeader="false" :title="$t('api_test.automation.scenario_import')" style="overflow: auto" :modal="false" size="90%">
+      <scenario-relevance @save="addScenario" ref="scenarioRelevance"/>
-        <ms-import-api-scenario @addScenario="addScenario"/>
-      </el-drawer>
 
       <!-- 环境 -->
       <api-environment-config ref="environmentConfig" @close="environmentConfigClose"/>
@@ -251,6 +249,7 @@
   import "@/common/css/material-icons.css"
   import OutsideClick from "@/common/js/outside-click";
   import ScenarioApiRelevance from "./api/ScenarioApiRelevance";
+  import ScenarioRelevance from "./api/ScenarioRelevance";
 
   export default {
     name: "EditApiScenario",
@@ -259,13 +258,13 @@
       currentScenario: {},
     },
     components: {
+      ScenarioRelevance,
       ScenarioApiRelevance,
       ApiEnvironmentConfig,
       MsScenarioParameters,
       MsApiReportDetail,
       MsInputTag, MsRun,
       MsApiScenarioComponent,
-      MsImportApiScenario,
       MsJsr233Processor,
       MsConstantTimer,
       MsIfController,
@@ -490,7 +489,8 @@
             this.customizeVisible = true;
             break;
           case ELEMENT_TYPE.scenario:
-            this.scenarioVisible = true;
+            // this.scenarioVisible = true;
+            this.$refs.scenarioRelevance.open();
             break;
           default:
             this.$refs.apiImport.open();
@@ -548,8 +548,7 @@
         this.customizeRequest = {};
         this.sort();
         this.reload();
-      }
+      },
-      ,
       addScenario(arr) {
         if (arr && arr.length > 0) {
           arr.forEach(item => {
@@ -564,8 +563,7 @@
         this.sort();
         this.reload();
         this.scenarioVisible = false;
-      }
+      },
-      ,
       setApiParameter(item, refType, referenced) {
         let request = {};
         if (Object.prototype.toString.call(item.request).indexOf("String") > 0) {

frontend/src/business/components/api/automation/scenario/api/ScenarioApiRelevance.vue

@@ -108,38 +108,6 @@
         setModuleOptions(data) {
           this.moduleOptions = data;
         },
-
-        saveCaseRelevance() {
-
-          let param = {};
-          let url = '';
-          let environmentId = undefined;
-          let selectIds = [];
-          if (this.isApiListEnable) {
-            url = '/api/definition/relevance';
-            environmentId = this.$refs.apiList.environmentId;
-            selectIds = Array.from(this.$refs.apiList.selectRows).map(row => row.id);
-          } else {
-            url = '/api/testcase/relevance';
-            environmentId = this.$refs.apiCaseList.environmentId;
-            selectIds = Array.from(this.$refs.apiCaseList.selectRows).map(row => row.id);
-          }
-
-          if (!environmentId) {
-            this.$warning(this.$t('api_test.environment.select_environment'));
-            return;
-          }
-          param.planId = this.planId;
-          param.selectIds = selectIds;
-          param.environmentId = environmentId;
-          this.result = this.$post(url, param, () => {
-            this.$success(this.$t('commons.save_success'));
-            this.$emit('refresh');
-            this.refresh();
-            this.$refs.baseRelevance.close();
-          });
-        },
-
         refresh() {
           if (this.isApiListEnable) {
             this.$refs.apiList.initTable();
@@ -147,7 +115,6 @@
             this.$refs.apiCaseList.initTable();
           }
         },
-
       }
     }
 </script>

frontend/src/business/components/api/automation/scenario/api/ScenarioRelevance.vue

@@ -0,0 +1,138 @@
+<template>
+  <el-dialog class="api-relevance" :title="$t('test_track.plan_view.relevance_test_case')"
+             :visible.sync="dialogVisible"
+             width="60%"
+             :close-on-click-modal="false"
+             top="50px">
+
+    <ms-container>
+      <ms-aside-container :enable-aside-hidden="false">
+        <ms-api-scenario-module
+          @nodeSelectEvent="nodeChange"
+          @refreshTable="refresh"
+          @setModuleOptions="setModuleOptions"
+          @enableTrash="false"
+          :is-read-only="true"
+          ref="nodeTree"/>
+      </ms-aside-container>
+
+      <ms-main-container>
+        <ms-api-scenario-list
+          :select-node-ids="selectNodeIds"
+          :referenced="true"
+          :trash-enable="false"
+          @selection="setData"
+          ref="apiScenarioList"/>
+      </ms-main-container>
+    </ms-container>
+
+    <template v-slot:footer>
+      <el-button type="primary" @click="copy" @keydown.enter.native.prevent>复制</el-button>
+      <el-button type="primary" @click="reference" @keydown.enter.native.prevent>引用</el-button>
+    </template>
+
+  </el-dialog>
+</template>
+
+<script>
+    import ScenarioRelevanceCaseList from "./ScenarioRelevanceCaseList";
+    import MsApiModule from "../../../definition/components/module/ApiModule";
+    import MsContainer from "../../../../common/components/MsContainer";
+    import MsAsideContainer from "../../../../common/components/MsAsideContainer";
+    import MsMainContainer from "../../../../common/components/MsMainContainer";
+    import ScenarioRelevanceApiList from "./ScenarioRelevanceApiList";
+    import MsApiScenarioModule from "../ApiScenarioModule";
+    import MsApiScenarioList from "../ApiScenarioList";
+    import {getUUID} from "../../../../../../common/js/utils";
+    export default {
+      name: "ScenarioRelevance",
+      components: {
+        MsApiScenarioList,
+        MsApiScenarioModule,
+        MsMainContainer, MsAsideContainer, MsContainer},
+      data() {
+          return {
+            dialogVisible: false,
+            result: {},
+            currentProtocol: null,
+            selectNodeIds: [],
+            moduleOptions: {},
+            isApiListEnable: true,
+
+            currentScenario: [],
+            currentScenarioIds: [],
+          }
+      },
+      methods: {
+        reference() {
+          let scenarios = [];
+          if (!this.currentScenario || this.currentScenario.length < 1) {
+            this.$emit('请选择场景');
+            return;
+          }
+          this.currentScenario.forEach(item => {
+            let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'REF', resourceId: getUUID()};
+            scenarios.push(obj);
+          });
+          this.$emit('save', scenarios);
+          this.close();
+        },
+        copy() {
+          let scenarios = [];
+          if (!this.currentScenarioIds || this.currentScenarioIds.length < 1) {
+            this.$emit('请选择场景');
+            return;
+          }
+          this.result = this.$post("/api/automation/getApiScenarios/", this.currentScenarioIds, response => {
+            if (response.data) {
+              response.data.forEach(item => {
+                let scenarioDefinition = JSON.parse(item.scenarioDefinition);
+                let obj = {id: item.id, name: item.name, type: "scenario", referenced: 'Copy', resourceId: getUUID(), hashTree: scenarioDefinition.hashTree};
+                scenarios.push(obj);
+              });
+              this.$emit('save', scenarios);
+              this.close();
+            }
+          })
+        },
+        close() {
+          this.refresh();
+          this.dialogVisible = false;
+        },
+        open() {
+          this.dialogVisible = true;
+          if (this.$refs.apiScenarioList) {
+            this.$refs.apiScenarioList.search();
+          }
+        },
+        nodeChange(node, nodeIds, pNodes) {
+          this.selectNodeIds = nodeIds;
+        },
+        handleProtocolChange(protocol) {
+          this.currentProtocol = protocol;
+        },
+        setModuleOptions(data) {
+          this.moduleOptions = data;
+        },
+        refresh() {
+            this.$refs.apiScenarioList.search();
+        },
+        setData(data) {
+          this.currentScenario = Array.from(data).map(row => row);
+          this.currentScenarioIds = Array.from(data).map(row => row.id);
+        },
+      }
+    }
+</script>
+
+<style scoped>
+
+  .ms-aside-container {
+    border: 0px;
+  }
+
+  .api-relevance >>> .el-dialog__body {
+    padding: 10px 20px;
+  }
+
+</style>

frontend/src/business/components/performance/report/components/PerformancePressureConfig.vue

@@ -112,8 +112,8 @@ export default {
       threadGroups: [],
     }
   },
-  mounted() {
+  activated() {
-    // this.getJmxContent();
+    this.getJmxContent();
   },
   methods: {
     calculateLoadConfiguration: function (data) {

frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue

@@ -15,10 +15,6 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
                              :content="$t('test_track.plan_view.relevance_test_case')"
                              @click="$emit('openTestCaseRelevanceDialog')"/>
-            <ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document"
-                             :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
-            <ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document"
-                             :content="$t('test_track.plan_view.view_report')" @click="openReport"/>
             <ms-table-button :is-tester-permission="true" icon="el-icon-document-remove"
                              :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>
           </template>
@@ -204,8 +200,6 @@
         :is-read-only="isReadOnly"
         @refreshTable="search"/>
 
-      <test-report-template-list @openReport="openReport" ref="testReportTemplateList"/>
-      <test-case-report-view @refresh="initTableData" ref="testCaseReportView"/>
     </el-card>
     <batch-edit ref="batchEdit" @batchEdit="batchEdit"
                 :type-arr="typeArr" :value-arr="valueArr" :dialog-title="$t('test_track.case.batch_edit_case')"/>
@@ -242,8 +236,6 @@ export default {
   name: "FunctionalTestCaseList",
   components: {
     FunctionalTestCaseEdit,
-    TestCaseReportView,
-    TestReportTemplateList,
     MsTableOperatorButton,
     MsTableOperator,
     MethodTableItem,
@@ -522,9 +514,6 @@ export default {
       }
       this.initTableData();
     },
-    openTestReport() {
-      this.$refs.testReportTemplateList.open(this.planId);
-    },
     statusChange(param) {
       this.$post('/test/plan/case/edit', param, () => {
         for (let i = 0; i < this.tableData.length; i++) {
@@ -543,16 +532,7 @@ export default {
         });
       }
     },
-    openReport(planId, id) {
+
-      this.getTestPlanById();
-      if (!id) {
-        id = this.testPlan.reportId;
-      }
-      if (!planId) {
-        planId = this.planId;
-      }
-      this.$refs.testCaseReportView.open(planId, id);
-    },
     filter(filters) {
       _filter(filters, this.condition);
       this.initTableData();

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433
+Subproject commit 8cda5c873cd9985c97adb34efacf507167fa4182