fix(接口测试): 修复执行场景，通过率不更新的缺陷

--bug=1019460 --user=王孝刚 【接口测试】测试计划-场景用例-通过率显示NAN
https://www.tapd.cn/55049933/s/1291157

api-test/backend/src/main/java/io/metersphere/api/jmeter/MsApiBackendListener.java

@@ -9,6 +9,7 @@ import io.metersphere.commons.utils.CommonBeanFactory;
 import io.metersphere.commons.utils.FileUtils;
 import io.metersphere.commons.utils.FixedCapacityUtil;
 import io.metersphere.commons.utils.JSON;
+import io.metersphere.commons.vo.ResultVO;
 import io.metersphere.constants.BackendListenerConstants;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.ResultDTO;
@@ -35,7 +36,7 @@ public class MsApiBackendListener extends AbstractBackendListenerClient implemen
     private List<SampleResult> queues;
     private ResultDTO dto;
     // 当前场景报告/用例结果状态
-    private String status;
+    private ResultVO resultVO;
 
     /**
      * 参数初始化方法
@@ -51,6 +52,7 @@ public class MsApiBackendListener extends AbstractBackendListenerClient implemen
         if (testResultService == null) {
             testResultService = CommonBeanFactory.getBean(TestResultService.class);
         }
+        resultVO = new ResultVO();
         super.setupTest(context);
     }
 
@@ -67,8 +69,8 @@ public class MsApiBackendListener extends AbstractBackendListenerClient implemen
             JMeterBase.resultFormatting(sampleResults, dto);
             testResultService.saveResults(dto);
 
-            status = ReportStatusUtil.getStatus(dto, status);
+            resultVO = ReportStatusUtil.getStatus(dto, resultVO);
-            dto.getArbitraryData().put(CommonConstants.LOCAL_STATUS_KEY, status);
+            dto.getArbitraryData().put(CommonConstants.LOCAL_STATUS_KEY, resultVO);
             sampleResults.clear();
         }
     }
@@ -93,8 +95,8 @@ public class MsApiBackendListener extends AbstractBackendListenerClient implemen
 
                 LoggerUtil.info("执行结果入库存储", dto.getReportId());
                 testResultService.saveResults(dto);
-                status = ReportStatusUtil.getStatus(dto, status);
+                resultVO = ReportStatusUtil.getStatus(dto, resultVO);
-                dto.getArbitraryData().put(CommonConstants.LOCAL_STATUS_KEY, status);
+                dto.getArbitraryData().put(CommonConstants.LOCAL_STATUS_KEY, resultVO);
                 LoggerUtil.info("重试结果处理结束", dto.getReportId());
             }
             // 全局并发队列

api-test/backend/src/main/java/io/metersphere/api/jmeter/utils/ReportStatusUtil.java

@@ -2,6 +2,7 @@ package io.metersphere.api.jmeter.utils;
 
 import io.metersphere.commons.constants.CommonConstants;
 import io.metersphere.commons.enums.ApiReportStatus;
+import io.metersphere.commons.vo.ResultVO;
 import io.metersphere.dto.RequestResult;
 import io.metersphere.dto.ResultDTO;
 import io.metersphere.utils.LoggerUtil;
@@ -42,25 +43,27 @@ public class ReportStatusUtil {
      * @param dto jmeter返回
      * @return
      */
-    public static String getStatus(ResultDTO dto, String status) {
+    public static ResultVO getStatus(ResultDTO dto, ResultVO resultVO) {
-        if (StringUtils.equals(status, ApiReportStatus.ERROR.name())) {
+        resultVO.computerTotal(dto.getRequestResults().size());
-            return status;
+        resultVO.computerSuccess(dto.getRequestResults().stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ApiReportStatus.SUCCESS.name())).count());
+        if (StringUtils.equals(resultVO.getStatus(), ApiReportStatus.ERROR.name())) {
+            return resultVO;
         }
         if (MapUtils.isNotEmpty(dto.getArbitraryData()) && dto.getArbitraryData().containsKey(CommonConstants.REPORT_STATUS)) {
             // 资源池执行整体传输失败，单条传输内容，获取资源池执行统计的状态
-            return String.valueOf(dto.getArbitraryData().get(CommonConstants.REPORT_STATUS));
+            resultVO.setStatus(String.valueOf(dto.getArbitraryData().get(CommonConstants.REPORT_STATUS)));
         }
         // 过滤掉重试结果后进行统计
         List<RequestResult> requestResults = filterRetryResults(dto.getRequestResults());
         long errorSize = requestResults.stream().filter(requestResult ->
                 StringUtils.equalsIgnoreCase(requestResult.getStatus(), ApiReportStatus.ERROR.name())).count();
         // 误报
-        long errorReportResultSize = dto.getRequestResults().stream(). filter(
+        long errorReportResultSize = dto.getRequestResults().stream().filter(
                 requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ApiReportStatus.FAKE_ERROR.name())).count();
         // 默认状态
-        status = dto.getRequestResults().isEmpty() && StringUtils.isEmpty(status)
+        String status = dto.getRequestResults().isEmpty() && StringUtils.isEmpty(resultVO.getStatus())
                 ? ApiReportStatus.PENDING.name()
-                : StringUtils.defaultIfEmpty(status, ApiReportStatus.SUCCESS.name());
+                : StringUtils.defaultIfEmpty(resultVO.getStatus(), ApiReportStatus.SUCCESS.name());
         if (errorSize > 0) {
             status = ApiReportStatus.ERROR.name();
         } else if (errorReportResultSize > 0) {
@@ -73,18 +76,22 @@ public class ReportStatusUtil {
             LoggerUtil.info("资源 " + dto.getTestId() + " 执行超时", dto.getReportId());
             status = ApiReportStatus.ERROR.name();
         }
-        return status;
+        resultVO.setStatus(status);
+        return resultVO;
     }
 
-    public static String getStatus(ResultDTO dto) {
+    public static ResultVO computedProcess(ResultDTO dto) {
+        ResultVO result = new ResultVO();
         if (MapUtils.isNotEmpty(dto.getArbitraryData()) && dto.getArbitraryData().containsKey(CommonConstants.LOCAL_STATUS_KEY)) {
             // 本地执行状态
-            return String.valueOf(dto.getArbitraryData().get(CommonConstants.LOCAL_STATUS_KEY));
+            result = (ResultVO) dto.getArbitraryData().get(CommonConstants.LOCAL_STATUS_KEY);
+            return result;
         }
         if (MapUtils.isNotEmpty(dto.getArbitraryData()) && dto.getArbitraryData().containsKey(CommonConstants.REPORT_STATUS)) {
             // 资源池执行整体传输失败，单条传输内容，获取资源池执行统计的状态
-            return String.valueOf(dto.getArbitraryData().get(CommonConstants.REPORT_STATUS));
+            result = (ResultVO) dto.getArbitraryData().get(CommonConstants.REPORT_STATUS);
+            return result;
         }
-        return getStatus(dto, "");
+        return getStatus(dto, result);
     }
 }

api-test/backend/src/main/java/io/metersphere/commons/vo/ResultVO.java

@@ -0,0 +1,27 @@
+package io.metersphere.commons.vo;
+
+import lombok.Data;
+
+import java.text.DecimalFormat;
+
+@Data
+public class ResultVO {
+    private String status;
+    private long scenarioSuccess;
+    private int scenarioTotal;
+
+    public void computerTotal(int total) {
+        this.scenarioTotal += total;
+    }
+
+    public void computerSuccess(long success) {
+        this.scenarioSuccess += success;
+    }
+
+    public String computerPassRate() {
+        return new DecimalFormat("0%").format((float) this.scenarioSuccess / this.scenarioTotal);
+    }
+}
+
+
+

api-test/backend/src/main/java/io/metersphere/service/scenario/ApiScenarioReportService.java

@@ -18,6 +18,7 @@ import io.metersphere.commons.constants.*;
 import io.metersphere.commons.enums.ApiReportStatus;
 import io.metersphere.commons.exception.MSException;
 import io.metersphere.commons.utils.*;
+import io.metersphere.commons.vo.ResultVO;
 import io.metersphere.constants.RunModeConstants;
 import io.metersphere.dto.*;
 import io.metersphere.i18n.Translator;
@@ -41,7 +42,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.nio.charset.StandardCharsets;
-import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -278,20 +278,17 @@ public class ApiScenarioReportService {
     }
 
     public ApiScenarioReport updatePlanCase(ResultDTO dto) {
-        String status = ReportStatusUtil.getStatus(dto);
+        ResultVO resultVO = ReportStatusUtil.computedProcess(dto);
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode());
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), resultVO.getStatus(), dto.getRunMode());
         TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(dto.getTestId());
         if (testPlanApiScenario != null) {
             if (report != null) {
                 testPlanApiScenario.setLastResult(report.getStatus());
                 report.setScenarioId(testPlanApiScenario.getApiScenarioId());
             } else {
-                testPlanApiScenario.setLastResult(status);
+                testPlanApiScenario.setLastResult(resultVO.getStatus());
             }
-            long successSize = dto.getRequestResults().stream().filter(requestResult ->
+            String passRate = resultVO.computerPassRate();
-                    StringUtils.equalsIgnoreCase(requestResult.getStatus(), ApiReportStatus.SUCCESS.name())).count();
-
-            String passRate = new DecimalFormat("0%").format((float) successSize / dto.getRequestResults().size());
             testPlanApiScenario.setPassRate(passRate);
             testPlanApiScenario.setReportId(dto.getReportId());
             testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
@@ -300,7 +297,7 @@ public class ApiScenarioReportService {
             // 更新场景状态
             ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
             if (scenario != null) {
-                scenario.setLastResult(status);
+                scenario.setLastResult(resultVO.getStatus());
                 scenario.setPassRate(passRate);
                 scenario.setReportId(dto.getReportId());
                 int executeTimes = 0;
@@ -317,8 +314,8 @@ public class ApiScenarioReportService {
     public ApiScenarioReport updateSchedulePlanCase(ResultDTO dto) {
         List<String> testPlanReportIdList = new ArrayList<>();
 
-        String status = ReportStatusUtil.getStatus(dto);
+        ResultVO resultVO = ReportStatusUtil.computedProcess(dto);
-        ApiScenarioReportWithBLOBs report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode());
+        ApiScenarioReportWithBLOBs report = editReport(dto.getReportType(), dto.getReportId(), resultVO.getStatus(), dto.getRunMode());
         if (report != null) {
             if (StringUtils.isNotEmpty(dto.getTestPlanReportId()) && !testPlanReportIdList.contains(dto.getTestPlanReportId())) {
                 testPlanReportIdList.add(dto.getTestPlanReportId());
@@ -326,9 +323,8 @@ public class ApiScenarioReportService {
             TestPlanApiScenario testPlanApiScenario = testPlanApiScenarioMapper.selectByPrimaryKey(dto.getTestId());
             if (testPlanApiScenario != null) {
                 testPlanApiScenario.setLastResult(report.getStatus());
-                long successSize = dto.getRequestResults().stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ApiReportStatus.SUCCESS.name())).count();
+                String passRate = resultVO.computerPassRate();
-                String passRate = new DecimalFormat("0%").format((float) successSize / dto.getRequestResults().size());
+                testPlanApiScenario.setPassRate(resultVO.computerPassRate());
-                testPlanApiScenario.setPassRate(passRate);
 
                 testPlanApiScenario.setReportId(report.getId());
                 testPlanApiScenario.setUpdateTime(System.currentTimeMillis());
@@ -337,7 +333,7 @@ public class ApiScenarioReportService {
                 // 更新场景状态
                 ApiScenario scenario = apiScenarioMapper.selectByPrimaryKey(testPlanApiScenario.getApiScenarioId());
                 if (scenario != null) {
-                    scenario.setLastResult(status);
+                    scenario.setLastResult(resultVO.getStatus());
                     scenario.setPassRate(passRate);
                     scenario.setReportId(report.getId());
                     int executeTimes = 0;
@@ -420,22 +416,17 @@ public class ApiScenarioReportService {
 
     public ApiScenarioReport updateScenario(ResultDTO dto) {
         // 更新报告状态
-        String status = ReportStatusUtil.getStatus(dto);
+        ResultVO resultVO = ReportStatusUtil.computedProcess(dto);
-        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), status, dto.getRunMode());
+        ApiScenarioReport report = editReport(dto.getReportType(), dto.getReportId(), resultVO.getStatus(), dto.getRunMode());
         // 更新场景状态
         ApiScenarioWithBLOBs scenario = apiScenarioMapper.selectByPrimaryKey(dto.getTestId());
         if (scenario == null) {
             scenario = apiScenarioMapper.selectByPrimaryKey(report.getScenarioId());
         }
         if (scenario != null) {
-            scenario.setLastResult(status);
+            scenario.setLastResult(resultVO.getStatus());
-            long successSize = dto.getRequestResults().stream().filter(requestResult -> StringUtils.equalsIgnoreCase(requestResult.getStatus(), ApiReportStatus.SUCCESS.name())).count();
+            scenario.setPassRate(resultVO.computerPassRate());
-            if (dto.getRequestResults().size() == 0) {
+            scenario.setPassRate(resultVO.computerPassRate());
-                scenario.setPassRate("0%");
-            } else {
-                scenario.setPassRate(new DecimalFormat("0%").format((float) successSize / dto.getRequestResults().size()));
-            }
-
             scenario.setReportId(dto.getReportId());
             int executeTimes = 0;
             if (scenario.getExecuteTimes() != null) {