Merge branch 'wangdingyi' into 'dev'

查询测试方法、任务进度

See merge request !285

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

@@ -2,6 +2,7 @@ package com.ruoyi.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.TestType;
+import com.ruoyi.domain.vo.TestTypeVO;
 import com.ruoyi.web.request.TestTypeRequest;
 
 import java.util.List;
@@ -15,4 +16,10 @@ public interface ITestTypeService extends IService<TestType> {
      * @return 测试类型库集合
      */
     public List<TestType> selectTestTypeList(TestTypeRequest testTypeRequest);
+
+    /**
+     * 从科恩获取所有测试方法
+     * @return
+     */
+    List<TestTypeVO> getTestTypeList();
 }

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

@@ -7,10 +7,8 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.DataStatisticsUtils;
-import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -798,7 +796,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                     } else if(resultNum == null) {
                         response.setTest(0.0);
                     } else {
-                        BigDecimal num = new BigDecimal((resultNum / useCaseNum) * 90);
+                        BigDecimal num = new BigDecimal((1.0 * resultNum / useCaseNum) * 90);
                         response.setTest(num.setScale(1,BigDecimal.ROUND_UP).doubleValue());
                     }
 

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

 package com.ruoyi.service.impl;
 
 
+import cn.hutool.http.HttpUtil;
+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;
 
@@ -34,4 +38,13 @@ public class TestTypeServiceImpl extends ServiceImpl<TestTypeMapper, TestType> i
         }
         return testTypeMapper.selectTestTypeList(testTypeRequest);
     }
+
+    @Override
+    public List<TestTypeVO> 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);
+    }
 }

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.domain.TestType;
+import com.ruoyi.domain.vo.TestTypeVO;
 import com.ruoyi.service.ITestTypeService;
 import com.ruoyi.web.request.TestTypeRequest;
 import io.swagger.annotations.Api;
@@ -51,4 +52,13 @@ public class TestTypeController extends BaseController {
         return R.ok(testTypeService.selectTestTypeList(testTypeRequest));
     }
 
+    // 从科恩获取所有测试方法
+    @ApiOperation("查询所有测试方法(科恩)")
+    @Trace
+    @Tags({@Tag(key = "param", value = "arg[0]"), @Tag(key = "result", value = "returnedObj")})
+    @RequestMapping(method = RequestMethod.POST, value = "/getTestTypeList")
+    public R<List<TestTypeVO>> getTestTypeList(){
+        return R.ok(testTypeService.getTestTypeList());
+    }
+
 }