修改获取单接口用例列表接口

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

@@ -33,17 +33,10 @@ public class TestcaseController {
      */
     @GetMapping("/list")
     public JsonResult getTestcaseList(Integer moduleId,
+                                      String testcaseName,
                                       @RequestParam(defaultValue = "1") Integer pageNum,
                                       @RequestParam(defaultValue = "10") Integer pageSize) {
-        IPage<Testcase> page = new Page<>(pageNum, pageSize);
-        IPage<Testcase> testcaseIPageEntity;
-        if (moduleId != null) {
-            QueryWrapper<Testcase> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("module_id", moduleId);
-            testcaseIPageEntity = testcaseService.page(page, queryWrapper);
-        } else {
-            testcaseIPageEntity = testcaseService.page(page);
-        }
+        IPage<Testcase> testcaseIPageEntity = testcaseService.getTestcaseList(moduleId, testcaseName, pageNum, pageSize);
         Map<String, Object> map = new HashMap<>();
         map.put("total", testcaseIPageEntity.getTotal());
         map.put("list", testcaseIPageEntity.getRecords());

src/main/java/cn/qg/holmes/entity/auto/Testcase.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,8 @@ public class Testcase {
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+    @TableField(exist = false)
+    private String interfaceName;
+    @TableField(exist = false)
+    private String moduleName;
 }

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

@@ -2,6 +2,8 @@ package cn.qg.holmes.mapper.auto;
 
 import cn.qg.holmes.entity.auto.Testcase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 
 public interface TestcaseMapper extends BaseMapper<Testcase> {
+    IPage<Testcase> getTestcaseList(IPage<Testcase> page, Integer moduleId, String testcaseName);
 }

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

 package cn.qg.holmes.service.auto;
 
 import cn.qg.holmes.entity.auto.Testcase;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 public interface TestcaseService extends IService<Testcase> {
 
+    IPage<Testcase> getTestcaseList(Integer moduleId, String testcaseName, Integer pageNum, Integer pageSize);
+
     String singleTestcaseExecutor(String namespace, Integer testcaseId, String batch);
 
     String executeTestcaseByModuleId(String namespace, Integer moduleId, String batch);

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

@@ -9,6 +9,8 @@ import cn.qg.holmes.service.auto.*;
 import cn.qg.holmes.utils.HttpClientUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +44,12 @@ public class TestcaseServiceImpl extends ServiceImpl<TestcaseMapper, Testcase> i
     @Autowired
     TestcaseReportService testcaseReportService;
 
+    @Override
+    public IPage<Testcase> getTestcaseList(Integer moduleId, String testcaseName, Integer pageNum, Integer pageSize) {
+        IPage<Testcase> page = new Page<>(pageNum, pageSize);
+        return testcaseMapper.getTestcaseList(page, moduleId, testcaseName);
+    }
+
     /**
      * 执行单接口用例
      * @param namespace 环境

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!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.TestcaseMapper">
+
+    <select id="getTestcaseList" resultType="cn.qg.holmes.entity.auto.Testcase">
+        SELECT tc.*, am.`name` as moduleName, it.`name` as interfaceName
+        FROM `testcase` as tc
+        INNER JOIN `auto_module` as am ON tc.`module_id` = am.`id`
+        INNER JOIN `interface` as it ON tc.`interface_id` = it.`id`
+        WHERE 1=1
+        <if test="moduleId != null and moduleId !=''">
+            AND tc.`module_id` = #{moduleId}
+        </if>
+        <if test="testcaseName != null and testcaseName !=''">
+            AND tc.`name` LIKE CONCAT('%', #{testcaseName}, '%')
+        </if>
+    </select>
+</mapper>
\ No newline at end of file