feat(接口定义): 场景报告内容增加未执行统计

场景报告内容增加未执行统计

backend/src/main/java/io/metersphere/api/dto/ApiScenarioReportDTO.java

@@ -14,16 +14,20 @@ public class ApiScenarioReportDTO {
     private long total;
     private long error;
     private long errorCode;
+    private long unExecute;
 
     private long scenarioTotal;
     private long scenarioError;
     private long scenarioSuccess;
     private long scenarioErrorReport;
+    private long scenarioUnExecute;
 
     private long scenarioStepTotal;
     private long scenarioStepError;
     private long scenarioStepSuccess;
     private long scenarioStepErrorReport;
+    private long scenarioStepUnExecuteReport;
+
 
     private long totalAssertions = 0;
     private long passAssertions = 0;

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

@@ -145,14 +145,17 @@ public class ApiScenarioReportStructureService {
         }
     }
 
-    private void scenarioCalculate(List<StepTreeDTO> dtoList, AtomicLong isError, AtomicLong isErrorReport, boolean errorIsFirst) {
+    private void scenarioCalculate(List<StepTreeDTO> dtoList, AtomicLong isError, AtomicLong isErrorReport, AtomicLong isUnExecute, boolean errorIsFirst) {
         /**
          * 判断场景步骤的执行状态
          * 失败状态的优先级最高，其次是误报
          */
         for (StepTreeDTO step : dtoList) {
             if (step.getValue() != null) {
-                if (StringUtils.isNotEmpty(step.getErrorCode())) {
+                if (step.getValue() instanceof RequestResultExpandDTO
+                        && StringUtils.equalsIgnoreCase(((RequestResultExpandDTO) step.getValue()).getStatus(), "unexecute")) {
+                    isUnExecute.set(isUnExecute.longValue() + 1);
+                } else if (StringUtils.isNotEmpty(step.getErrorCode())) {
                     isErrorReport.set(isErrorReport.longValue() + 1);
                 } else if (step.getValue().getError() > 0 || !step.getValue().isSuccess()) {
                     isError.set(isError.longValue() + 1);
@@ -160,8 +163,11 @@ public class ApiScenarioReportStructureService {
             } else if (CollectionUtils.isNotEmpty(step.getChildren())) {
                 AtomicLong isChildrenError = new AtomicLong();
                 AtomicLong isChildrenErrorReport = new AtomicLong();
-                stepChildrenErrorCalculate(step.getChildren(), isChildrenError, isChildrenErrorReport);
+                AtomicLong isChildrenUnExecute = new AtomicLong();
-                if (errorIsFirst) {
+                stepChildrenErrorCalculate(step.getChildren(), isChildrenError, isChildrenErrorReport, isChildrenUnExecute);
+                if (isChildrenUnExecute.longValue() > 0) {
+                    isUnExecute.set(isUnExecute.longValue() + 1);
+                } else if (errorIsFirst) {
                     if (isChildrenError.longValue() > 0) {
                         isError.set(isError.longValue() + 1);
                     } else if (isChildrenErrorReport.longValue() > 0) {
@@ -179,15 +185,18 @@ public class ApiScenarioReportStructureService {
         }
     }
 
-    private void calculate(List<StepTreeDTO> dtoList, AtomicLong totalScenario, AtomicLong scenarioError, AtomicLong totalTime, AtomicLong errorReport, boolean isErrorFirst) {
+    private void calculate(List<StepTreeDTO> dtoList, AtomicLong totalScenario, AtomicLong scenarioError, AtomicLong totalTime, AtomicLong errorReport, AtomicLong unExecute, boolean isErrorFirst) {
         for (StepTreeDTO step : dtoList) {
             if (StringUtils.equals(step.getType(), "scenario")) {
                 totalScenario.set((totalScenario.longValue() + 1));
                 // 失败结果数量
                 AtomicLong error = new AtomicLong();
                 AtomicLong errorReportCode = new AtomicLong();
-                scenarioCalculate(step.getChildren(), error, errorReportCode, isErrorFirst);
+                AtomicLong isUnExecute = new AtomicLong();
-                if (error.longValue() > 0) {
+                scenarioCalculate(step.getChildren(), error, errorReportCode, isUnExecute, isErrorFirst);
+                if (isUnExecute.longValue() > 0) {
+                    unExecute.set(unExecute.longValue() + 1);
+                } else if (error.longValue() > 0) {
                     scenarioError.set((scenarioError.longValue() + 1));
                 } else if (errorReportCode.longValue() > 0) {
                     errorReport.set((errorReport.longValue() + 1));
@@ -203,15 +212,15 @@ public class ApiScenarioReportStructureService {
                 }
             }
             if (CollectionUtils.isNotEmpty(step.getChildren())) {
-                calculate(step.getChildren(), totalScenario, scenarioError, totalTime, errorReport, isErrorFirst);
+                calculate(step.getChildren(), totalScenario, scenarioError, totalTime, errorReport, unExecute, isErrorFirst);
             }
         }
     }
 
-    private void calculateStep(List<StepTreeDTO> dtoList, AtomicLong stepError, AtomicLong stepTotal, AtomicLong stepErrorCode, boolean isErrorFirst) {
+    private void calculateStep(List<StepTreeDTO> dtoList, AtomicLong stepError, AtomicLong stepTotal, AtomicLong stepErrorCode, AtomicLong stepUnExecute, boolean isErrorFirst) {
         for (StepTreeDTO step : dtoList) {
             // 失败结果数量
-            scenarioCalculate(step.getChildren(), stepError, stepErrorCode, isErrorFirst);
+            scenarioCalculate(step.getChildren(), stepError, stepErrorCode, stepUnExecute, isErrorFirst);
             if (CollectionUtils.isNotEmpty(step.getChildren())) {
                 stepTotal.set((stepTotal.longValue() + step.getChildren().size()));
             }
@@ -324,19 +333,9 @@ public class ApiScenarioReportStructureService {
             reportDTO.setPassAssertions(reportResults.stream().mapToLong(ApiDefinitionExecResultVo::getPassAssertions).sum());
             reportDTO.setTotalAssertions(reportResults.stream().mapToLong(ApiDefinitionExecResultVo::getTotalAssertions).sum());
 
-            // 统计场景数据
+            reportDTO = this.countReportNum(stepList, reportDTO);
-            AtomicLong totalScenario = new AtomicLong();
-            AtomicLong scenarioError = new AtomicLong();
-            AtomicLong totalTime = new AtomicLong();
-            AtomicLong errorReport = new AtomicLong();
-
-            calculate(stepList, totalScenario, scenarioError, totalTime, errorReport, true);
-            reportDTO.setTotalTime(totalTime.longValue());
-            reportDTO.setScenarioTotal(totalScenario.longValue());
-            reportDTO.setScenarioError(scenarioError.longValue());
-            reportDTO.setScenarioErrorReport(errorReport.longValue());
-            //统计步骤数据
             reportDTO.setScenarioStepSuccess((reportResults.size() - reportDTO.getError()));
+            //统计步骤数据
             reportDTO.setScenarioStepTotal(reportResults.size());
             reportDTO.setScenarioStepError(reportDTO.getError());
             reportDTO.setScenarioStepErrorReport(0);
@@ -385,44 +384,80 @@ public class ApiScenarioReportStructureService {
             Map<String, List<ApiScenarioReportResult>> maps = reportResults.stream().collect(Collectors.groupingBy(ApiScenarioReportResult::getResourceId));
             this.reportFormatting(stepList, maps);
 
+            reportDTO = this.countReportNum(stepList, reportDTO);
+            // 统计场景数据
+            AtomicLong stepError = new AtomicLong();
+            AtomicLong stepTotal = new AtomicLong();
+
+            reportDTO.setScenarioSuccess((reportDTO.getScenarioTotal() - reportDTO.getScenarioError() - reportDTO.getScenarioUnExecute()));
+
+            //统计步骤数据
+            AtomicLong stepErrorCode = new AtomicLong();
+            AtomicLong stepUnExecute = new AtomicLong();
+            calculateStep(stepList, stepError, stepTotal, stepErrorCode, stepUnExecute, false);
+            reportDTO.setScenarioStepSuccess((stepTotal.longValue() - stepError.longValue() - stepErrorCode.longValue()));
+            reportDTO.setScenarioStepTotal(stepTotal.longValue());
+            reportDTO.setScenarioStepError(stepError.longValue());
+            reportDTO.setScenarioStepErrorReport(stepErrorCode.longValue());
+            reportDTO.setScenarioStepUnExecuteReport(stepUnExecute.longValue());
+            reportDTO.setConsole(scenarioReportStructure.getConsole());
+            reportDTO.setSteps(stepList);
+
+            //统计未执行的请求数量
+            AtomicLong allUnExecute = new AtomicLong();
+            this.countAllUnexecute(stepList, allUnExecute);
+            reportDTO.setUnExecute(allUnExecute.longValue());
+        }
+        return reportDTO;
+    }
+
+    private void countAllUnexecute(List<StepTreeDTO> stepList, AtomicLong allUnExecute) {
+        for (StepTreeDTO step : stepList) {
+            if (step.getValue() != null) {
+                if (step.getValue() instanceof RequestResultExpandDTO
+                        && StringUtils.equalsIgnoreCase(((RequestResultExpandDTO) step.getValue()).getStatus(), "unexecute")) {
+                    allUnExecute.set(allUnExecute.longValue() + 1);
+                }
+            }
+            if(CollectionUtils.isNotEmpty(step.getChildren())){
+                this.countAllUnexecute(step.getChildren(),allUnExecute);
+            }
+        }
+    }
+
+    private ApiScenarioReportDTO countReportNum(List<StepTreeDTO> stepList, ApiScenarioReportDTO reportDTO) {
+        if (reportDTO != null && CollectionUtils.isNotEmpty(stepList)) {
             // 统计场景数据
             AtomicLong totalScenario = new AtomicLong();
             AtomicLong scenarioError = new AtomicLong();
             AtomicLong totalTime = new AtomicLong();
             AtomicLong errorReport = new AtomicLong();
-            AtomicLong stepError = new AtomicLong();
+            AtomicLong unExecute = new AtomicLong();
-            AtomicLong stepTotal = new AtomicLong();
+            calculate(stepList, totalScenario, scenarioError, totalTime, errorReport, unExecute, true);
-
-            calculate(stepList, totalScenario, scenarioError, totalTime, errorReport, true);
             reportDTO.setTotalTime(totalTime.longValue());
             reportDTO.setScenarioTotal(totalScenario.longValue());
             reportDTO.setScenarioError(scenarioError.longValue());
             reportDTO.setScenarioErrorReport(errorReport.longValue());
-            reportDTO.setScenarioSuccess((totalScenario.longValue() - scenarioError.longValue()));
+            reportDTO.setScenarioUnExecute(unExecute.longValue());
-            //统计步骤数据
-            AtomicLong stepErrorCode = new AtomicLong();
-            calculateStep(stepList, stepError, stepTotal, stepErrorCode, false);
-            reportDTO.setScenarioStepSuccess((stepTotal.longValue() - stepError.longValue() - stepErrorCode.longValue()));
-            reportDTO.setScenarioStepTotal(stepTotal.longValue());
-            reportDTO.setScenarioStepError(stepError.longValue());
-            reportDTO.setScenarioStepErrorReport(stepErrorCode.longValue());
-            reportDTO.setConsole(scenarioReportStructure.getConsole());
-            reportDTO.setSteps(stepList);
         }
         return reportDTO;
     }
 
-    private void stepChildrenErrorCalculate(List<StepTreeDTO> dtoList, AtomicLong isError, AtomicLong isErrorReport) {
+
+    private void stepChildrenErrorCalculate(List<StepTreeDTO> dtoList, AtomicLong isError, AtomicLong isErrorReport, AtomicLong isUnExecute) {
         for (StepTreeDTO step : dtoList) {
             if (step.getValue() != null) {
-                if (step.getValue().getError() > 0 || !step.getValue().isSuccess()) {
+                if (step.getValue() instanceof RequestResultExpandDTO
+                        && StringUtils.equalsIgnoreCase(((RequestResultExpandDTO) step.getValue()).getStatus(), "unexecute")) {
+                    isUnExecute.set(isUnExecute.longValue() + 1);
+                } else if (step.getValue().getError() > 0 || !step.getValue().isSuccess()) {
                     isError.set(isError.longValue() + 1);
                 }
                 if (StringUtils.isNotEmpty(step.getErrorCode())) {
                     isErrorReport.set(isErrorReport.longValue() + 1);
                 }
             } else if (CollectionUtils.isNotEmpty(step.getChildren())) {
-                stepChildrenErrorCalculate(step.getChildren(), isError, isErrorReport);
+                stepChildrenErrorCalculate(step.getChildren(), isError, isErrorReport, isUnExecute);
             }
         }
     }

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

@@ -29,6 +29,13 @@
                   <ms-scenario-results v-on:requestResult="requestResult" :console="content.console"
                                        :treeData="fullTreeNodes" ref="errorReportTree"/>
                 </el-tab-pane>
+                <el-tab-pane name="unExecute" v-if="content.unExecute > 0">
+                  <template slot="label">
+                    <span class="fail">{{ $t('api_test.home_page.detail_card.unexecute') }}</span>
+                  </template>
+                  <ms-scenario-results v-on:requestResult="requestResult" :console="content.console"
+                                       :treeData="fullTreeNodes" ref="unExecuteTree"/>
+                </el-tab-pane>
                 <el-tab-pane name="console">
                   <template slot="label">
                     <span class="console">{{ $t('api_test.definition.request.console') }}</span>
@@ -129,6 +136,8 @@ export default {
         this.$refs.failsTree.filter(index);
       } else if (this.activeName === "errorReport") {
         this.$refs.errorReportTree.filter("errorReport");
+      } else if(this.activeName === "unExecute"){
+        this.$refs.unExecuteTree.filter("unexecute");
       }
     },
     init() {

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

@@ -48,6 +48,13 @@
                   <ms-scenario-results v-on:requestResult="requestResult" :console="content.console"
                                        :treeData="fullTreeNodes" ref="errorReportTree"/>
                 </el-tab-pane>
+                <el-tab-pane name="unExecute" v-if="content.unExecute > 0">
+                  <template slot="label">
+                    <span class="fail">{{ $t('api_test.home_page.detail_card.unexecute') }}</span>
+                  </template>
+                  <ms-scenario-results v-on:requestResult="requestResult" :console="content.console"
+                                       :treeData="fullTreeNodes" ref="unExecuteTree"/>
+                </el-tab-pane>
                 <el-tab-pane name="console">
                   <template slot="label">
                     <span class="console">{{ $t('api_test.definition.request.console') }}</span>
@@ -201,6 +208,8 @@ export default {
         this.$refs.failsTree.filter(index);
       } else if (this.activeName === "errorReport") {
         this.$refs.errorReportTree.filter("errorReport");
+      } else if(this.activeName === "unExecute"){
+        this.$refs.unExecuteTree.filter("unexecute");
       }
     },
     handleClick(tab, event) {

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

@@ -21,25 +21,32 @@
           <el-row type="flex" justify="center" align="middle" style="width: 150px">
             <div>
               <div class="metric-icon-box" style="height: 26px">
-                <span class="ms-point-success" style="margin: 7px"/>
+                <span class="ms-point-success" style="margin: 7px;float: left;"/>
                 <div class="metric-box">
                   <div class="value" style="font-size: 12px">{{ content.success }} {{ $t('api_report.success') }}</div>
                 </div>
               </div>
               <el-divider></el-divider>
               <div class="metric-icon-box" style="height: 26px">
-                <span class="ms-point-error" style="margin: 7px"/>
+                <span class="ms-point-error" style="margin: 7px;float: left;"/>
                 <div class="metric-box">
                   <div class="value" style="font-size: 12px">{{ content.error }} {{ $t('api_report.fail') }}</div>
                 </div>
               </div>
               <el-divider v-if="content.errorCode > 0"></el-divider>
-              <div class="metric-icon-box" style="height: 26px">
+              <div class="metric-icon-box" v-if="content.errorCode > 0" style="height: 26px">
-                <span class="ms-point-error-code" v-if="content.errorCode > 0" style="margin: 7px"/>
+                <span class="ms-point-error-code"  style="margin: 7px;float: left;"/>
                 <div class="metric-box" v-if="content.errorCode > 0">
                   <div class="value" style="font-size: 12px">{{ content.errorCode }} {{ $t('error_report_library.option.name') }}</div>
                 </div>
               </div>
+              <el-divider v-if="content.unExecute > 0"></el-divider>
+              <div class="metric-icon-box" v-if="content.unExecute > 0" style="height: 26px">
+                <span class="ms-point-unexecute"  style="margin: 7px;float: left;"/>
+                <div class="metric-box" v-if="content.unExecute > 0">
+                  <div class="value" style="font-size: 12px">{{ content.unExecute }} {{ $t('api_test.home_page.detail_card.unexecute') }}</div>
+                </div>
+              </div>
             </div>
 
           </el-row>
@@ -68,6 +75,11 @@
               <div class="value">{{ content.scenarioErrorReport ? content.scenarioErrorReport : 0 }}</div>
               <div class="name">{{ $t('error_report_library.option.name') }}</div>
             </div>
+            <span class="ms-point-unexecute" v-if="content.unExecute > 0 || content.unExecute > 0 "/>
+            <div class="metric-box"  v-if="content.unExecute > 0 || content.unExecute > 0 ">
+              <div class="value">{{ content.scenarioUnExecute ? content.scenarioUnExecute : 0 }}</div>
+              <div class="name">{{ $t('api_test.home_page.detail_card.unexecute') }}</div>
+            </div>
           </el-row>
           <el-divider v-if="report.reportType !== 'API_INTEGRATED'"/>
           <el-row type="flex" justify="center" align="middle">
@@ -91,6 +103,11 @@
                 <div class="value">{{ content.scenarioStepErrorReport ? content.scenarioStepErrorReport : 0 }}</div>
                 <div class="name">{{ $t('error_report_library.option.name') }}</div>
               </div>
+              <span class="ms-point-unexecute" v-if="content.unExecute > 0 || content.unExecute > 0 "/>
+              <div class="metric-box"  v-if="content.unExecute > 0 || content.unExecute > 0 ">
+                <div class="value">{{ content.scenarioStepUnExecuteReport ? content.scenarioStepUnExecuteReport : 0 }}</div>
+                <div class="name">{{ $t('api_test.home_page.detail_card.unexecute') }}</div>
+              </div>
             </el-row>
           </el-row>
       </div>
@@ -392,4 +409,15 @@
     margin-right: 20px;
     background-color : #F6972A;
   }
+
+  .ms-point-unexecute {
+    border-radius: 50%;
+    height: 12px;
+    width: 12px;
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 20px;
+    margin-right: 20px;
+    background-color : #9C9B9A;
+  }
 </style>

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

@@ -62,7 +62,11 @@ export default {
           if (data.errorCode && data.errorCode !== "") {
             return true;
           }
-        } else {
+        } if (value === 'unexecute') {
+          if(data.value.status === 'unexecute'){
+            return true;
+          }
+        }else {
           if (!data.errorCode || data.errorCode === "") {
             return data.value.error > 0;
           }

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -432,9 +432,6 @@ export default {
     // 通知过来的数据跳转到编辑
     if (this.$route.query.caseId) {
       this.activeDom = 'middle';
-      // this.$get('/api/testcase/findById/' + this.$route.query.caseId, (response) => {
-      //   this.edit(response.data);
-      // });
     }
   },
   mounted() {