fix(base): 生成简陋报告,完成了基本功能

kt-base/src/main/java/org/matrix/testNg/web/entity/DataBean.java

@@ -32,7 +32,7 @@ public class DataBean {
     /**
      * 执行总时间
      */
-    private Long allTime;
+    private String allTime;
 
     /**
      * 用例通过率

kt-base/src/main/java/org/matrix/testNg/web/entity/DataBeans.java

@@ -43,7 +43,7 @@ public class DataBeans {
     /**
      * 单个测试时间
      */
-    private String duration;
+    private Long duration;
 
     /**
      * 结果信息

kt-base/src/main/java/org/matrix/testNg/web/report/ReporterData.java

 package org.matrix.testNg.web.report;
 
+import org.matrix.testNg.utils.Duration;
+import org.matrix.testNg.utils.SecToTime;
 import org.matrix.testNg.web.entity.DataBean;
-import org.matrix.testNg.web.entity.DataMove;
 import org.matrix.testNg.web.entity.DataBeans;
+import org.matrix.testNg.web.entity.DataMove;
 import org.matrix.testNg.web.vo.DataBeansVo;
 import org.matrix.util.ReporterUtils;
 
@@ -22,10 +24,13 @@ public class ReporterData {
         DataBeansVo dataBeansVo = ReporterUtils.map.get("dataBeansVo");
         int passNum = 0;
         int failNum = 0;
+        Long oneTime = 0L;
         // 测试结果汇总数据
         DataBean dataBean = dataBeansVo.getDataBean();
         List<DataBeans> dataBeanLists = dataBeansVo.getDataBeanLists();
         for (DataBeans dataBeanList : dataBeanLists) {
+            Long duration = dataBeanList.getDuration();
+            oneTime = oneTime + duration;
             if (dataBeanList.getResult()) {
                 passNum += 1;
             } else {
@@ -40,7 +45,12 @@ public class ReporterData {
         dataBean.setTotal(passNum + failNum);
         //通过率
         dataBean.setProbability(passNum / (passNum + failNum));
-        // TODO 时间需要处理,通过率需要处理
+        Duration duration = SecToTime.secToTime(oneTime);
+        Integer hour = duration.getHour();
+        Integer minute = duration.getMinute();
+        Integer second = duration.getSecond();
+        String allTime = hour + "." + minute + "." + second;
+        dataBean.setAllTime(allTime);
         return dataBean;
     }
 

kt-base/src/main/java/org/matrix/testNg/web/report/ReporterDataJob.java

 package org.matrix.testNg.web.report;
 
+import org.matrix.testNg.utils.Duration;
+import org.matrix.testNg.utils.SecToTime;
 import org.matrix.testNg.web.entity.DataBean;
 import org.matrix.testNg.web.entity.DataBeans;
 import org.matrix.testNg.web.entity.DataMove;
@@ -23,12 +25,15 @@ public class ReporterDataJob {
         DataBeansJobVo dataBeansJobVo = ReporterUtils.jobMap.get("job");
         int passNum = 0;
         int failNum = 0;
+        Long oneTime = 0L;
         // 测试结果汇总数据
         DataBean dataBean = dataBeansJobVo.getDataBean();
         List<DataBeansMoveVo> dataBeansMoveVos = dataBeansJobVo.getDataBeansMove();
         for (DataBeansMoveVo dataBeansMoveVo : dataBeansMoveVos) {
             List<DataBeans> dataBeansList = dataBeansMoveVo.getDataBeansList();
             for (DataBeans dataBeans : dataBeansList) {
+                Long duration = dataBeans.getDuration();
+                oneTime = oneTime + duration;
                 if (dataBeans.getResult()) {
                     passNum += 1;
                 } else {
@@ -44,7 +49,12 @@ public class ReporterDataJob {
         dataBean.setTotal(passNum + failNum);
         //通过率
         dataBean.setProbability(passNum / (passNum + failNum));
-        // TODO 时间需要处理,通过率需要处理
+        Duration duration = SecToTime.secToTime(oneTime);
+        Integer hour = duration.getHour();
+        Integer minute = duration.getMinute();
+        Integer second = duration.getSecond();
+        String allTime = hour + "." + minute + "." + second;
+        dataBean.setAllTime(allTime);
         return dataBean;
     }