Merge branch 'wangdingyi' into 'dev'

查询测试方法

See merge request !286

quality-review/src/main/java/com/ruoyi/service/ITestTypeService.java

@@ -21,5 +21,5 @@ public interface ITestTypeService extends IService<TestType> {
      * 从科恩获取所有测试方法
      * @return
      */
-    List<TestTypeVO> getTestTypeList();
+    List<String> getTestTypeList();
 }

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

@@ -6,17 +6,17 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.ruoyi.domain.TestType;
-import com.ruoyi.domain.vo.ScenarioVO;
-import com.ruoyi.domain.vo.TestTypeVO;
 import com.ruoyi.mapper.TestTypeMapper;
 import com.ruoyi.service.ITestTypeService;
 
 import com.ruoyi.web.request.TestTypeRequest;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional
@@ -40,11 +40,21 @@ public class TestTypeServiceImpl extends ServiceImpl<TestTypeMapper, TestType> i
     }
 
     @Override
-    public List<TestTypeVO> getTestTypeList() {
+    public List<String> getTestTypeList() {
         //以post形式请求接口
         String result= HttpUtil.post("https://10.12.48.78:8090/DescribeScenarioTestTypeList","");
         JSONObject jsonObject = JSONObject.parseObject(result);
 
-        return jsonObject.getList("test_type_list", TestTypeVO.class);
+        return jsonObject.getList("test_type_list", TypeVO.class)
+                .stream()
+                .map(TypeVO::getName)
+                .collect(Collectors.toList());
+    }
+
+    @Data
+    public static class TypeVO {
+
+        private String name;
+
     }
 }

quality-review/src/main/java/com/ruoyi/web/TestTypeController.java

@@ -57,7 +57,7 @@ public class TestTypeController extends BaseController {
     @Trace
     @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
     @RequestMapping(method = RequestMethod.POST, value = "/getTestTypeList")
-    public R<List<TestTypeVO>> getTestTypeList(){
+    public R<List<String>> getTestTypeList(){
         return R.ok(testTypeService.getTestTypeList());
     }
 

quality-review/src/main/java/com/ruoyi/web/request/TestUserCaseListRequest.java

+package com.ruoyi.web.request;
+
+import com.ruoyi.common.core.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "TestUserCaseListRequest", description = "查询测试用例")
+public class TestUserCaseListRequest extends PageDomain {
+
+    @ApiModelProperty("测试场景")
+    private String testScenario;
+
+    @ApiModelProperty("测试方法")
+    private String testType;
+
+    @ApiModelProperty("用例编号或者名称关键字")
+    private String searchKeywords;
+}

quality-review/src/main/java/com/ruoyi/web/response/TestUserCaseListResponse.java

+package com.ruoyi.web.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "TestUserCaseListResponse", description = "查询测试用例")
+@Data
+public class TestUserCaseListResponse {
+
+    @ApiModelProperty("测试场景")
+    private String testScenario;
+
+    @ApiModelProperty("测试方法")
+    private String testType;
+
+    @ApiModelProperty("用例编号")
+    private String useCaseNo;
+
+    @ApiModelProperty("用例名称")
+    private String useCaseName;
+
+    @ApiModelProperty("对应输入")
+    private String input;
+
+    @ApiModelProperty("用例描述")
+    private String description;
+}