Merge branch 'dev' into 'master'

dev - master 23

See merge request !361

quality-review/src/main/java/com/ruoyi/domain/vo/UseCaseVO.java

@@ -14,12 +14,12 @@ public class UseCaseVO {
     private String name;
 
     // 测试场景
-//    private String scenario;
+    private String scenarioName;
     private ScenarioKEVO scenario;
 
 
     // 测试方法
-//    private String test_type;
+    private String test_type;
     private MethodVo method;
 
     /**
@@ -27,7 +27,9 @@ public class UseCaseVO {
      * @return
      */
     public String getCoordinates() {
-        return scenario.getClass().getName() + method.getClass().getName();
+        scenarioName = scenario.getName();
+        test_type = method.getName();
+        return scenarioName + test_type;
     }
 }
 

quality-review/src/main/java/com/ruoyi/service/impl/MatrixServiceImpl.java

@@ -73,8 +73,6 @@ public class MatrixServiceImpl implements MatrixService {
             }
         }
 
-//        String caseResult= HttpUtil.post("https://10.12.48.78:8090/DescribeCaseList","");
-
         OkHttpClient client = new OkHttpClient().newBuilder().build();
 
         MediaType mediaType = MediaType.parse("application/json");
@@ -106,15 +104,9 @@ public class MatrixServiceImpl implements MatrixService {
         String string = responseR.body().string();
         JSONObject jsonO = JSONObject.parseObject(string);
 
-
-
-//        JSONObject object = JSONObject.parseObject(caseResult);
-
         // 获取测试用例列表
         List<UseCaseVO> caseList = jsonO.getJSONObject("data").getJSONObject("useCases").getList("nodes", UseCaseVO.class);
 
-
-//        List<UseCaseVO> caseList = object.getList("case_list", UseCaseVO.class);
         MatrixResponse response = new MatrixResponse();
         setHeaderName(response, testTypeList);
         setRowsName(response, scenarioList, testTypeList, caseList);
@@ -213,21 +205,4 @@ public class MatrixServiceImpl implements MatrixService {
         }
         return null;
     }
-
-    @Data
-    public static class CaseVO {
-
-        private String id;
-
-        private String name;
-
-        private ScenarioKEVO scenario;
-
-        private MethodVo method;
-
-        public String getCoordinates() {
-            return scenario.getClass().getName() + method.getClass().getName();
-        }
-
-    }
 }