[feature]

.gitignore

@@ -3,7 +3,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**
 !**/src/testCase/**
-
+/log
 ### STS ###
 .apt_generated
 .classpath

pom.xml

@@ -118,6 +118,13 @@
             <version>2.1.5</version>
             <scope>testCase</scope>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-math3 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.6.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/zjty/autotest/controller/ReportController.java

@@ -2,6 +2,8 @@ package com.zjty.autotest.controller;
 
 import com.google.common.collect.ImmutableMap;
 import com.zjty.autotest.pojo.vo.Statistics;
+import com.zjty.autotest.pojo.vo.report.DistributionParam;
+import com.zjty.autotest.pojo.vo.report.Environment;
 import com.zjty.autotest.pojo.vo.report.Report;
 import com.zjty.autotest.pojo.vo.report.ReportVo;
 import com.zjty.autotest.service.ReportService;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @CrossOrigin
@@ -74,5 +77,25 @@ public class ReportController {
         return ResponseEntity.ok(statistics);
     }
 
+    @ApiOperation(value = "根据测试报告 统计出每个环境对应的所有步骤耗时的正态分布参数 ", notes = "请求数据传一组测试报告id")
+    @PostMapping("/distribution/step")
+    public ResponseEntity<Map<Environment, DistributionParam>> stepsDistributionParamOfEnvironments(@RequestBody List<Integer> ids) {
+        List<ReportVo> reports = reportService.findByIds(ids).stream()
+                .map(transHelper::reportDo)
+                .map(transHelper::reportVo)
+                .collect(Collectors.toList());
+        Map<Environment, DistributionParam> result = reportService.environmentStepCostTimeDistributionParamMap(reports);
+        return ResponseEntity.ok(result);
+    }
 
+    @ApiOperation(value = "根据测试报告 统计出每个环境对应的所有测试报告总耗时的正态分布参数 ", notes = "请求数据传一组测试报告id")
+    @PostMapping("/distribution/test")
+    public ResponseEntity<Map<Environment, DistributionParam>> testsDistributionParamOfEnvironments(@RequestBody List<Integer> ids) {
+        List<ReportVo> reports = reportService.findByIds(ids).stream()
+                .map(transHelper::reportDo)
+                .map(transHelper::reportVo)
+                .collect(Collectors.toList());
+        Map<Environment, DistributionParam> result = reportService.environmentTestCostTimeDistributionParamMap(reports);
+        return ResponseEntity.ok(result);
+    }
 }

src/main/java/com/zjty/autotest/pojo/dbo/terminal/Terminal.java

+package com.zjty.autotest.pojo.dbo.terminal;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Terminal {
+
+    String os;
+
+
+
+}

src/main/java/com/zjty/autotest/pojo/vo/report/DistributionParam.java

+package com.zjty.autotest.pojo.vo.report;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DistributionParam {
+
+    private Double average;
+
+    private Double standardDivination;
+
+}

src/main/java/com/zjty/autotest/pojo/vo/report/Environment.java

+package com.zjty.autotest.pojo.vo.report;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Environment {
+
+    private String os;
+
+    private String browser;
+
+}

src/main/java/com/zjty/autotest/service/ReportService.java

 package com.zjty.autotest.service;
 
 import com.zjty.autotest.pojo.vo.Statistics;
-import com.zjty.autotest.pojo.vo.report.Report;
+import com.zjty.autotest.pojo.vo.report.*;
 import com.zjty.autotest.pojo.dbo.report.ReportDo;
-import com.zjty.autotest.pojo.vo.report.ReportVo;
-import com.zjty.autotest.pojo.vo.report.Step;
 import com.zjty.autotest.repository.ReportRepository;
 import com.zjty.autotest.service.helper.TransHelper;
+import com.zjty.autotest.util.MathUtil;
+import org.apache.commons.math3.distribution.NormalDistribution;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
 
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static java.lang.String.format;
@@ -193,4 +192,49 @@ public class ReportService {
         return Math.toIntExact(count);
     }
 
+    private Environment environment(ReportVo report) {
+        return new Environment(report.getOs(), report.getBrowser());
+    }
+
+    public Map<Environment, DistributionParam> environmentStepCostTimeDistributionParamMap(List<ReportVo> reports) {
+        Map<Environment, DistributionParam> result = new HashMap<>();
+        Set<Environment> environments = reports.stream()
+                .map(this::environment)
+                .collect(Collectors.toSet());
+        for (Environment environment : environments) {
+            Double[] stepCostTimesOfThisEnvironment = reports.stream()
+                    .filter(report -> Objects.equals(report.getOs(), environment.getOs()) && Objects.equals(report.getBrowser(), environment.getBrowser()))
+                    .flatMap(report -> report.getSteps().stream())
+                    .map(Step::getCostTime)
+                    .filter(costTime -> costTime >= 0)
+                    .map(Long::doubleValue)
+                    .toArray(Double[]::new);
+            Double average = MathUtil.average(stepCostTimesOfThisEnvironment);
+            Double standardDivination = MathUtil.standardDivination(stepCostTimesOfThisEnvironment);
+            DistributionParam distributionParam = new DistributionParam(average, standardDivination);
+            result.put(environment, distributionParam);
+        }
+        return result;
+    }
+
+    public Map<Environment, DistributionParam> environmentTestCostTimeDistributionParamMap(List<ReportVo> reports) {
+        Map<Environment, DistributionParam> result = new HashMap<>();
+        Set<Environment> environments = reports.stream()
+                .map(this::environment)
+                .collect(Collectors.toSet());
+        for (Environment environment : environments) {
+            Double[] testCostTimesOfThisEnvironment = reports.stream()
+                    .filter(report -> Objects.equals(report.getOs(), environment.getOs()) && Objects.equals(report.getBrowser(), environment.getBrowser()))
+                    .map(ReportVo::getCostTime)
+                    .filter(costTime -> costTime >= 0)
+                    .map(Long::doubleValue)
+                    .toArray(Double[]::new);
+            Double average = MathUtil.average(testCostTimesOfThisEnvironment);
+            Double standardDivination = MathUtil.standardDivination(testCostTimesOfThisEnvironment);
+            DistributionParam distributionParam = new DistributionParam(average, standardDivination);
+            result.put(environment, distributionParam);
+        }
+        return result;
+    }
+
 }

src/main/java/com/zjty/autotest/util/MathUtil.java

+package com.zjty.autotest.util;
+
+@SuppressWarnings("Duplicates")
+public class MathUtil {
+
+    /**
+     * 传入一个数列x计算平均值
+     * @return 平均值
+     * @param x
+     */
+    public static double average(Double[] x) {
+        int n = x.length;            //数列元素个数
+        double sum = 0;
+        for (double i : x) {        //求和
+            sum+=i;
+        }
+        return sum/n;
+    }
+
+    //方差s^2=[(x1-x)^2 +...(xn-x)^2]/n 或者s^2=[(x1-x)^2 +...(xn-x)^2]/(n-1)
+    public static double variance(double[] x) {
+        int m = x.length;
+        double sum = 0;
+        for (int i = 0; i < m; i++) {//求和
+            sum += x[i];
+        }
+        double dAve = sum / m;//求平均值
+        double dVar = 0;
+        for (int i = 0; i < m; i++) {//求方差
+            dVar += (x[i] - dAve) * (x[i] - dAve);
+        }
+        return dVar / m;
+    }
+
+    //标准差σ=sqrt(s^2)
+    public static double standardDivination(Double[] x) {
+        int m = x.length;
+        double sum = 0;
+        for (int i = 0; i < m; i++) {//求和
+            sum += x[i];
+        }
+        double dAve = sum / m;//求平均值
+        double dVar = 0;
+        for (int i = 0; i < m; i++) {//求方差
+            dVar += (x[i] - dAve) * (x[i] - dAve);
+        }
+        //reture Math.sqrt(dVar/(m-1));
+        return Math.sqrt(dVar / m);
+    }
+
+
+}

src/main/resources/adapter/index.html

-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>seleniumide1</title><link href="static/css/app.2a82befe.css" rel="preload" as="style" crossorigin><link href="static/css/chunk-vendors.fef80702.css" rel="preload" as="style" crossorigin><link href="static/js/app.08c5d19d.js" rel="preload" as="script" crossorigin><link href="static/js/chunk-vendors.dda05319.js" rel="preload" as="script" crossorigin><link href="static/css/chunk-vendors.fef80702.css" rel="stylesheet" crossorigin><link href="static/css/app.2a82befe.css" rel="stylesheet" crossorigin></head><body style="background-color: #eef1fa;"><div id="app"></div><script src="static/js/chunk-vendors.dda05319.js" crossorigin></script><script src="static/js/app.08c5d19d.js" crossorigin></script></body></html>
\ No newline at end of file

src/main/resources/adapter/static/css/app.2a82befe.css

-#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;text-align:center;margin:0;padding:0;box-sizing:border-box;color:#2c3e50}#app /deep/ .el-header{padding:0;height:.447917rem;background-color:#fff;width:100vw;display:flex;align-items:center}.title{font-size:.177083rem;color:#383874}.back,.title{font-weight:bolder;padding-left:3%;cursor:pointer}.back{font-size:.130208rem;letter-spacing:.005208rem;z-index:1000}.back img{padding-bottom:.026042rem}#nav{padding:.15625rem}#nav a{font-weight:700;color:#2c3e50}#nav a.router-link-exact-active{color:#42b983}.input{float:right;margin-bottom:3%}.input /deep/ .el-button{background-color:#383874;color:#fff;letter-spacing:.005208rem;font-size:.104167rem}.table /deep/ .el-table .el-link{margin-right:.052083rem}.table /deep/ .el-dialog__wrapper{display:flex;justify-content:center;align-items:center}.table /deep/ .el-dialog .el-dialog__header{display:flex;margin-left:5%;padding-left:0;width:90%;border-bottom:.005208rem solid #5059d5}.table /deep/ .el-dialog .el-dialog__header /deep/ .el-dialog__title{color:#383874;font-size:.078125rem;font-weight:bolder;letter-spacing:.005208rem}.table /deep/ .el-dialog .el-dialog__footer /deep/ .dialog-footer .el-button{height:.177083rem;width:.416667rem;color:#fff;border-radius:.041667rem;border:none}.table /deep/ .el-dialog .el-dialog__footer /deep/ .dialog-footer .el-button--default{background-color:#383874}.table /deep/ .el-dialog .el-dialog__footer /deep/ .dialog-footer .el-button--primary{background-color:#ee4b4a}.table /deep/ .el-table .el-table__header .has-gutter tr th{background-color:#383874;color:#fff;letter-spacing:.005208rem}#components-layout-demo-basic[data-v-1ed0b193]{text-align:center}.ant-layout-header[data-v-1ed0b193]{font-size:2em;background-color:#fff;text-align:left}.tableTitle[data-v-1ed0b193]{display:inline-block;margin-left:45%;color:#383874;font-weight:700}.ant-layout-footer[data-v-1ed0b193]{line-height:1.5}.middle[data-v-1ed0b193]{background-color:#e7e4e4}.ant-layout-sider[data-v-1ed0b193]{background-color:#fff;line-height:.208333rem;height:4.583333rem;margin-top:.052083rem}.testExampleList[data-v-1ed0b193]{height:1.25rem;overflow:auto;overflow-y:overlay}.ant-layout-content[data-v-1ed0b193]{color:#fff;height:4.6875rem;line-height:.3125rem;position:relative;margin-left:.104167rem}.ant-layout[data-v-1ed0b193]{margin-bottom:.25rem}.ant-layout[data-v-1ed0b193]:last-child{margin:0}.script[data-v-1ed0b193]{display:inline-block;font-size:2em;color:#383874;font-weight:700}.uploadScript[data-v-1ed0b193]{height:.208333rem;width:.520833rem;line-height:.208333rem;margin-left:90%;margin-top:.078125rem;margin-bottom:.104167rem;border-radius:5%;border:none;background-color:#383874;cursor:pointer}.exampleHeader[data-v-1ed0b193]{height:.15625rem;width:70%;display:flex;justify-content:center;align-items:center;float:right;margin-top:.052083rem;margin-right:15%;border-bottom:.005208rem solid #383874}.square[data-v-1ed0b193]{height:.0625rem;width:.0625rem;background-color:#383874}.testExampleTitle[data-v-1ed0b193]{width:70%;margin-left:.026042rem;margin-right:.026042rem;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:left}.testExampleTitle[data-v-1ed0b193]:hover{cursor:pointer;color:#00bfff}.allPlay[data-v-1ed0b193]{height:.104167rem;width:.104167rem;cursor:pointer}.example[data-v-1ed0b193]{height:auto;width:60%;display:flex;justify-content:center;align-items:center;float:right;margin-right:15%;border-bottom:.005208rem dashed #383874}.circle[data-v-1ed0b193]{height:.041667rem;width:.041667rem;background-color:#383874;border-radius:50%}.exampleName[data-v-1ed0b193]{width:60%;margin-left:5%;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.exampleName[data-v-1ed0b193]:hover{color:#00bfff;cursor:pointer}.playBtn[data-v-1ed0b193]{margin-left:5%;height:.078125rem;width:.078125rem;cursor:pointer}[data-v-1ed0b193] .ant-table-header{background-color:#383874}[data-v-1ed0b193] .ant-table-header .ant-table-thead th{color:#fff;background-color:#383874;text-align:center}[data-v-1ed0b193] .ant-table-tbody td{text-align:center}[data-v-1ed0b193] .ant-modal{width:30%!important}.ant-form-item[data-v-1ed0b193]{display:flex;justify-items:center}[data-v-1ed0b193] .ant-form-item .ant-form-item-label{display:inline-block;width:40%;text-align:left}[data-v-1ed0b193] .ant-form-item .ant-form-item-label label{color:#383874}[data-v-1ed0b193] .ant-form-item .ant-form-item-control-wrapper{display:inline-block;width:60%}.cookieTitle[data-v-1ed0b193]{margin-left:2%;color:#383874}.ant-radio-group label[data-v-1ed0b193]{color:#383874}[data-v-1ed0b193] .ant-modal-footer{display:flex;justify-content:center}[data-v-1ed0b193] .cookieKey .ant-form-explain{margin-left:5%}.testNameTitle[data-v-1ed0b193]{margin-left:10%}.scriptUploadTitle[data-v-1ed0b193]{margin-top:10%;margin-bottom:10%;margin-left:30%}.testName[data-v-1ed0b193]{width:.520833rem;text-align:center;display:inline-block;color:#383874}.testNameInp[data-v-1ed0b193]{width:1.302083rem;border:none;border-radius:0;border-bottom:.005208rem solid #383874;display:inline-block}.scriptUpload[data-v-1ed0b193]{width:.520833rem;text-align:center;display:inline-block;color:#383874}.uploadBtn[data-v-1ed0b193]{border-radius:.052083rem;border-color:#383874;background-color:#fff;color:#383874}[data-v-1ed0b193] .upload .ant-upload-list-item-info{margin-left:22%}[data-v-1ed0b193] .upload .ant-upload-list-item-card-actions{right:50%}.dataCountBtn[data-v-1ed0b193]{height:.208333rem;width:.520833rem;margin-left:90%;background-color:#383874;color:#fff}.cookie[data-v-1ed0b193]{margin-top:10%;margin-left:10%}.cookieText[data-v-1ed0b193]{display:inline-block}.cookieInp[data-v-1ed0b193]{display:inline-block;width:.78125rem;margin-left:5%}.readBtn[data-v-9b5897ee]{margin-right:10%;color:#383874;background-color:#fff;border:none}.readBtn[data-v-9b5897ee]:hover{color:#00bfff}.deleteBtn[data-v-9b5897ee]{color:red;border:none}.return[data-v-c0192548]{text-align:left;margin-left:3%;color:#383874;font-size:1.5em;font-weight:700}.content[data-v-c0192548]{height:100%;width:80%;margin-top:.104167rem;margin-left:10%;text-align:left}h1[data-v-c0192548]{color:#383874;font-weight:700}.infoTitle[data-v-c0192548]{margin-top:.052083rem}.icon[data-v-c0192548]{display:inline-block;height:.052083rem;width:.026042rem;background-color:#383874}.baseInfo[data-v-c0192548]{margin-left:.026042rem;color:#383874;display:inline-block}.mainLine[data-v-c0192548]{margin-top:.052083rem;color:#383874}.secondLine[data-v-c0192548]{margin-top:.052083rem}.detailInfo[data-v-c0192548]{width:1.041667rem;margin-right:.520833rem;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.ant-table-wrapper[data-v-c0192548]{margin-top:.104167rem}[data-v-c0192548] .ant-table-header{background-color:#383874}[data-v-c0192548] .ant-table-wrapper .ant-table-thead th{text-align:center;background-color:#383874;color:#fff}[data-v-c0192548] .ant-table-wrapper td{text-align:center}[data-v-c0192548] .ant-modal-content{width:100%;height:auto}.process-left /deep/ .el-table .el-table__body .el-table__row td{font-size:.104167rem;letter-spacing:.005208rem;overflow:hidden;word-wrap:nowrap}.process-left /deep/ .el-table .el-table__body .el-table__row td :first-child{color:#383874;font-weight:bolder}.process{display:flex;justify-content:space-around;margin-top:.182292rem}.process-left{position:relative;width:1.166667rem}.process-left .left-tabel{height:100%;overflow-y:scroll;width:100%}.process-left .single{background-color:#fff}.process-left ul{height:.28125rem;padding:0;margin:0;width:100%;display:flex;justify-content:space-between;align-items:center;font-size:.104167rem;font-weight:bolder}.process-left ul li{cursor:pointer;width:50%;list-style:none;text-align:center}.process-left ul .success{color:#15b769}.process-left ul .wait{color:#bbb}.process-right{color:#383874;font-weight:bolder;font-size:.104167rem;width:8.020833rem;height:4.859375rem;flex-direction:column}.process-right,.process-right .right-header{display:flex;justify-content:space-between}.process-right .right-content{height:4.296875rem;width:100%;background-color:#2a2a30;color:#1f7d24;overflow-y:scroll}.process-right .right-content .font-content{margin:.104167rem;text-align:start;font-size:.130208rem;letter-spacing:.005208rem}.process-right .right-content .font-content span{margin-right:.052083rem}.process-right .right-bottom{display:flex;justify-content:flex-end}.process-right .right-bottom .bottom-font{margin-left:.625rem;color:#7778a3}#dataCount[data-v-d6e0efc2]{height:auto;width:50%;margin:5% auto;padding-top:.1%;padding-left:2%;padding-bottom:5%;background-color:#fff}h1[data-v-d6e0efc2]{margin-top:10%;text-align:left;color:#383874;font-weight:700;font-size:3em}.performanceTitle[data-v-d6e0efc2]{margin-top:10%}.exampleCountTitle[data-v-d6e0efc2]{text-align:left;color:#383874;font-weight:700;font-size:1.5em}.square[data-v-d6e0efc2]{display:inline-block;height:.078125rem;width:.5%;background-color:#383874}.exampleCountText[data-v-d6e0efc2]{margin-left:1%;display:inline-block;color:#383874}.detail[data-v-d6e0efc2]{width:90%;margin-left:12%;text-align:left}.detailData[data-v-d6e0efc2]{display:inline-block;width:24%;text-align:left;font-size:2em;color:#383874}[data-v-d6e0efc2] .ant-table-header{background-color:#383874}[data-v-d6e0efc2] .ant-table-thead th{color:#fff;background-color:#383874;text-align:center}[data-v-d6e0efc2] .ant-table-thead td{text-align:center}
\ No newline at end of file