Merge branch 'auto' into mock

src/main/java/cn/qg/holmes/controller/auto/SceneTestcaseController.java

@@ -22,20 +22,16 @@ public class SceneTestcaseController {
 
     /**
      * 获取场景用例列表
-     * @param projectId 项目id，不传表示获取所有项目场景用例
-     * @param pageNum 第几页
-     * @param pageSize 每页展示多少个
+     * @param sceneId 场景id
      * @return
      */
     @GetMapping("/list")
-    public JsonResult getSceneTestcaseList(Integer projectId,
-                                           @RequestParam(defaultValue = "1") Integer pageNum,
-                                           @RequestParam(defaultValue = "10") Integer pageSize) {
-        IPage<SceneTestcase> sceneTestcaseIPage = sceneTestcaseService.getSceneTestcaseList(projectId, pageNum, pageSize);
-        Map<String, Object> map = new HashMap<>();
-        map.put("total", sceneTestcaseIPage.getTotal());
-        map.put("list", sceneTestcaseIPage.getRecords());
-        return JsonResult.buildSuccessResult(map);
+    public JsonResult getSceneTestcaseListBySceneId(@RequestParam Integer sceneId) {
+        if (sceneId == null) {
+            return JsonResult.buildErrorStateResult("请传入场景id", false);
+        }
+        List<SceneTestcase> sceneTestcaseList = sceneTestcaseService.getSceneTestcaseListBySceneId(sceneId);
+        return JsonResult.buildSuccessResult(sceneTestcaseList);
     }
 
     /**

src/main/java/cn/qg/holmes/entity/auto/SceneTestcase.java

 package cn.qg.holmes.entity.auto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -31,4 +32,10 @@ public class SceneTestcase {
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+    @TableField(exist = false)
+    private String sceneName;
+    @TableField(exist = false)
+    private String interfaceName;
+    @TableField(exist = false)
+    private String moduleName;
 }

src/main/java/cn/qg/holmes/mapper/auto/SceneTestcaseMapper.java

@@ -4,6 +4,8 @@ import cn.qg.holmes.entity.auto.SceneTestcase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 public interface SceneTestcaseMapper extends BaseMapper<SceneTestcase> {
-    IPage<SceneTestcase> getSceneTestcaseList(Integer projectId, IPage<SceneTestcase> page);
+    List<SceneTestcase> getSceneTestcaseListBySceneId(Integer sceneId);
 }

src/main/java/cn/qg/holmes/service/auto/SceneTestcaseService.java

@@ -4,9 +4,11 @@ import cn.qg.holmes.entity.auto.SceneTestcase;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 public interface SceneTestcaseService extends IService<SceneTestcase> {
 
     String executeSceneTestcase(String namespace, Integer sceneId, String batch);
 
-    IPage<SceneTestcase> getSceneTestcaseList(Integer projectId, Integer pageNum, Integer pageSize);
+    List<SceneTestcase> getSceneTestcaseListBySceneId(Integer sceneId);
 }

src/main/java/cn/qg/holmes/service/auto/impl/SceneTestcaseServiceImpl.java

@@ -63,15 +63,12 @@ public class SceneTestcaseServiceImpl extends ServiceImpl<SceneTestcaseMapper, S
 
     /**
      * 获取场景用例列表
-     * @param projectId 项目id
-     * @param pageNum 第几页
-     * @param pageSize 每页多少条
+     * @param sceneId 项目id
      * @return
      */
     @Override
-    public IPage<SceneTestcase> getSceneTestcaseList(Integer projectId, Integer pageNum, Integer pageSize) {
-        IPage<SceneTestcase> page = new Page<>(pageNum, pageSize);
-        return sceneTestcaseMapper.getSceneTestcaseList(projectId, page);
+    public List<SceneTestcase> getSceneTestcaseListBySceneId(Integer sceneId) {
+        return sceneTestcaseMapper.getSceneTestcaseListBySceneId(sceneId);
     }
 
     public String sceneTestcaseExecution(String namespace, Integer sceneId, Integer interfaceId, UUID uuid, String batch) {

src/main/resources/mapper/auto/SceneTestcaseMapper.xml

@@ -2,11 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.qg.holmes.mapper.auto.SceneTestcaseMapper">
 
-    <select id="getSceneTestcaseList" resultType="cn.qg.holmes.entity.auto.SceneTestcase">
-        select stc.* from scene_testcase as stc
-            left join scene as sc ON stc.`scene_id`=sc.`id`
-        <if test="projectId != null">
-            WHERE sc.`id`= #{projectId}
+    <select id="getSceneTestcaseListBySceneId" resultType="cn.qg.holmes.entity.auto.SceneTestcase">
+        select stc.*,it.`name`,sc.`name`,am.`name` from `scene_testcase` as stc
+        INNER JOIN `interface` as it ON stc.`interface_id` = it.`id`
+        INNER JOIN `scene` as sc ON stc.`scene_id` = sc.`id`
+        INNER JOIN `auto_module` as am ON it.`module_id` = am.id
+        WHERE 1=1
+        <if test="sceneId != null and sceneId != ''">
+            AND stc.`scene_id` = #{sceneId}
         </if>
+        order by stc.`sequence`
     </select>
 </mapper>
\ No newline at end of file