xiaoe/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "自动化测试-增删改查"

Browse Source 
This reverts commit 8a97dbaf
This commit is contained in:
liangdaliang
2025-02-21 15:21:53 +08:00
parent e8038a8d57
commit d27e4c2157
27 changed files with 14 additions and 2784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test-test/src/main/java/com/test/test/controller/TestCaseController.java
View File

@@ -4,7 +4,7 @@ import java.util.List;
import com.test.common.utils.DateUtils;
import com.test.test.domain.qo.IDQO;
import com.test.test.domain.qo.GroupIdQO;
import com.test.test.domain.qo.TestCaseListQO;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +33,7 @@ public class TestCaseController extends BaseController {
* 查询用例列表
*/
@GetMapping("/list")
public TableDataInfo list(@Validated GroupIdQO qo) {
public TableDataInfo list(@Validated TestCaseListQO qo) {
startPage();
List<TestCase> list = testCaseService.selectTestCaseList(qo);
return getDataTable(list);

83
test-test/src/main/java/com/test/test/controller/TestTaskController.java
View File

@@ -1,83 +0,0 @@
package com.test.test.controller;
import java.util.List;
import com.test.common.utils.DateUtils;
import com.test.test.domain.qo.GroupIdQO;
import com.test.test.domain.qo.IDQO;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.test.common.annotation.Log;
import com.test.common.core.controller.BaseController;
import com.test.common.core.domain.AjaxResult;
import com.test.common.enums.BusinessType;
import com.test.test.domain.TestTask;
import com.test.test.service.ITestTaskService;
import com.test.common.utils.poi.ExcelUtil;
import com.test.common.core.page.TableDataInfo;
/**
* 自动化测试Controller
*/
@RestController
@RequestMapping("/test/task")
public class TestTaskController extends BaseController {
@Resource
private ITestTaskService testTaskService;
/**
* 查询自动化测试列表
*/
@GetMapping("/list")
public TableDataInfo list(GroupIdQO qo) {
startPage();
List<TestTask> list = testTaskService.selectTestTaskList(qo);
return getDataTable(list);
}
/**
* 获取自动化测试详细信息
*/
@PostMapping(value = "/detail")
public AjaxResult getInfo(@RequestBody IDQO qo) {
return success(testTaskService.selectTestTaskById(qo.getId()));
}
/**
* 新增自动化测试
*/
@Log(title = "自动化测试", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody TestTask testTask) {
testTask.setCreateBy(getLoginUser().getUsername());
testTask.setCreateTime(DateUtils.getNowDate());
testTask.setStatus(0);
return toAjax(testTaskService.insertTestTask(testTask));
}
/**
* 修改自动化测试
*/
@Log(title = "自动化测试", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
public AjaxResult edit(@RequestBody TestTask testTask) {
return toAjax(testTaskService.updateTestTask(testTask));
}
/**
* 删除自动化测试
*/
@Log(title = "自动化测试", businessType = BusinessType.DELETE)
@PostMapping("/del")
public AjaxResult remove(@RequestBody IDQO qo) {
return toAjax(testTaskService.deleteTestTaskById(qo.getId()));
}
}

59
test-test/src/main/java/com/test/test/domain/TestTask.java
View File

@@ -1,59 +0,0 @@
package com.test.test.domain;
import com.test.common.annotation.Excel;
import com.test.common.core.domain.BaseEntity;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
/**
* 自动化测试对象 test_task
*
* @author liangdl
* @date 2025-02-21
*/
@Setter
@Getter
@ToString
public class TestTask extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 任务id */
private Long id;
/** 任务名称 */
@Excel(name = "任务名称")
private String name;
/** 节点id */
@Excel(name = "节点id")
private Long groupId;
/** 项目id */
@Excel(name = "项目id")
private Long projectId;
/** crontab表达式 */
@Excel(name = "crontab表达式")
private String crontab;
/** 定时任务开关 */
@Excel(name = "定时任务开关")
private Integer status;
/** 失败重试开关 */
@Excel(name = "失败重试开关")
private Integer retry;
/** 失败重试次数 */
@Excel(name = "失败重试次数")
private Long retryCount;
/** 并行开关 */
@Excel(name = "并行开关")
private Integer async;
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
}

2
test-test/src/main/java/com/test/test/domain/qo/GroupIdQO.java → test-test/src/main/java/com/test/test/domain/qo/TestCaseListQO.java
View File

@@ -4,7 +4,7 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Data
public class GroupIdQO {
public class TestCaseListQO {
@NotNull(message = "父节点id不能为空")
private Long groupId;
}

4
test-test/src/main/java/com/test/test/mapper/TestCaseMapper.java
View File

@@ -1,7 +1,7 @@
package com.test.test.mapper;
import com.test.test.domain.TestCase;
import com.test.test.domain.qo.GroupIdQO;
import com.test.test.domain.qo.TestCaseListQO;
import java.util.List;
@@ -18,7 +18,7 @@ public interface TestCaseMapper
/**
* 查询用例列表
*/
List<TestCase> selectTestCaseList(GroupIdQO qo);
List<TestCase> selectTestCaseList(TestCaseListQO qo);
/**
* 新增用例

62
test-test/src/main/java/com/test/test/mapper/TestTaskMapper.java
View File

@@ -1,62 +0,0 @@
package com.test.test.mapper;
import com.test.test.domain.TestTask;
import java.util.List;
/**
* 自动化测试Mapper接口
*
* @author liangdl
* @date 2025-02-21
*/
public interface TestTaskMapper
{
/**
* 查询自动化测试
*
* @param id 自动化测试主键
* @return 自动化测试
*/
public TestTask selectTestTaskById(Long id);
/**
* 查询自动化测试列表
*
* @param testTask 自动化测试
* @return 自动化测试集合
*/
public List<TestTask> selectTestTaskList(TestTask testTask);
/**
* 新增自动化测试
*
* @param testTask 自动化测试
* @return 结果
*/
public int insertTestTask(TestTask testTask);
/**
* 修改自动化测试
*
* @param testTask 自动化测试
* @return 结果
*/
public int updateTestTask(TestTask testTask);
/**
* 删除自动化测试
*
* @param id 自动化测试主键
* @return 结果
*/
public int deleteTestTaskById(Long id);
/**
* 批量删除自动化测试
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTestTaskByIds(Long[] ids);
}

4
test-test/src/main/java/com/test/test/service/ITestCaseService.java
View File

@@ -1,7 +1,7 @@
package com.test.test.service;
import com.test.test.domain.TestCase;
import com.test.test.domain.qo.GroupIdQO;
import com.test.test.domain.qo.TestCaseListQO;
import java.util.List;
@@ -27,7 +27,7 @@ public interface ITestCaseService
* @param qo 用例
* @return 用例集合
*/
public List<TestCase> selectTestCaseList(GroupIdQO qo);
public List<TestCase> selectTestCaseList(TestCaseListQO qo);
/**
* 新增用例

62
test-test/src/main/java/com/test/test/service/ITestTaskService.java
View File

@@ -1,62 +0,0 @@
package com.test.test.service;
import com.test.test.domain.TestTask;
import java.util.List;
/**
* 自动化测试Service接口
*
* @author test
* @date 2025-02-21
*/
public interface ITestTaskService
{
/**
* 查询自动化测试
*
* @param id 自动化测试主键
* @return 自动化测试
*/
public TestTask selectTestTaskById(Long id);
/**
* 查询自动化测试列表
*
* @param testTask 自动化测试
* @return 自动化测试集合
*/
public List<TestTask> selectTestTaskList(TestTask testTask);
/**
* 新增自动化测试
*
* @param testTask 自动化测试
* @return 结果
*/
public int insertTestTask(TestTask testTask);
/**
* 修改自动化测试
*
* @param testTask 自动化测试
* @return 结果
*/
public int updateTestTask(TestTask testTask);
/**
* 批量删除自动化测试
*
* @param ids 需要删除的自动化测试主键集合
* @return 结果
*/
public int deleteTestTaskByIds(Long[] ids);
/**
* 删除自动化测试信息
*
* @param id 自动化测试主键
* @return 结果
*/
public int deleteTestTaskById(Long id);
}

2
test-test/src/main/java/com/test/test/service/impl/TestCaseServiceImpl.java
View File

@@ -68,7 +68,7 @@ public class TestCaseServiceImpl implements ITestCaseService
* @return 用例
*/
@Override
public List<TestCase> selectTestCaseList(GroupIdQO qo) {
public List<TestCase> selectTestCaseList(TestCaseListQO qo) {
return testCaseMapper.selectTestCaseList(qo);
}

97
test-test/src/main/java/com/test/test/service/impl/TestTaskServiceImpl.java
View File

@@ -1,97 +0,0 @@
package com.test.test.service.impl;
import com.test.common.utils.DateUtils;
import com.test.test.domain.TestTask;
import com.test.test.mapper.TestTaskMapper;
import com.test.test.service.ITestTaskService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 自动化测试Service业务层处理
*
* @author test
* @date 2025-02-21
*/
@Service
public class TestTaskServiceImpl implements ITestTaskService
{
@Resource
private TestTaskMapper testTaskMapper;
/**
* 查询自动化测试
*
* @param id 自动化测试主键
* @return 自动化测试
*/
@Override
public TestTask selectTestTaskById(Long id)
{
return testTaskMapper.selectTestTaskById(id);
}
/**
* 查询自动化测试列表
*
* @param testTask 自动化测试
* @return 自动化测试
*/
@Override
public List<TestTask> selectTestTaskList(TestTask testTask)
{
return testTaskMapper.selectTestTaskList(testTask);
}
/**
* 新增自动化测试
*
* @param testTask 自动化测试
* @return 结果
*/
@Override
public int insertTestTask(TestTask testTask)
{
testTask.setCreateTime(DateUtils.getNowDate());
return testTaskMapper.insertTestTask(testTask);
}
/**
* 修改自动化测试
*
* @param testTask 自动化测试
* @return 结果
*/
@Override
public int updateTestTask(TestTask testTask)
{
testTask.setUpdateTime(DateUtils.getNowDate());
return testTaskMapper.updateTestTask(testTask);
}
/**
* 批量删除自动化测试
*
* @param ids 需要删除的自动化测试主键
* @return 结果
*/
@Override
public int deleteTestTaskByIds(Long[] ids)
{
return testTaskMapper.deleteTestTaskByIds(ids);
}
/**
* 删除自动化测试信息
*
* @param id 自动化测试主键
* @return 结果
*/
@Override
public int deleteTestTaskById(Long id)
{
return testTaskMapper.deleteTestTaskById(id);
}
}

2
test-test/src/main/resources/mapper/test/TestCaseMapper.xml
View File

@@ -33,7 +33,7 @@
from test_case
</sql>
<select id="selectTestCaseList" parameterType="GroupIdQO" resultMap="TestCaseResult">
<select id="selectTestCaseList" parameterType="TestCaseListQO" resultMap="TestCaseResult">
<include refid="selectTestCaseVo"/>
<where>
group_id = #{groupId}

111
test-test/src/main/resources/mapper/test/TestTaskMapper.xml
View File

@@ -1,111 +0,0 @@
<?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="com.test.test.mapper.TestTaskMapper">
<resultMap type="TestTask" id="TestTaskResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="groupId" column="group_id" />
<result property="projectId" column="project_id" />
<result property="crontab" column="crontab" />
<result property="status" column="status" />
<result property="retry" column="retry" />
<result property="retryCount" column="retry_count" />
<result property="async" column="async" />
<result property="delFlag" column="del_flag" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectTestTaskVo">
select id, name, group_id, project_id, crontab, status, retry, retry_count, async, del_flag, create_by, create_time, update_by, update_time from test_task
</sql>
<select id="selectTestTaskList" parameterType="TestTask" resultMap="TestTaskResult">
<include refid="selectTestTaskVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="groupId != null "> and group_id = #{groupId}</if>
<if test="projectId != null "> and project_id = #{projectId}</if>
<if test="crontab != null and crontab != ''"> and crontab = #{crontab}</if>
<if test="status != null "> and status = #{status}</if>
<if test="retry != null "> and retry = #{retry}</if>
<if test="retryCount != null "> and retry_count = #{retryCount}</if>
<if test="async != null "> and async = #{async}</if>
</where>
</select>
<select id="selectTestTaskById" parameterType="Long" resultMap="TestTaskResult">
<include refid="selectTestTaskVo"/>
where id = #{id}
</select>
<insert id="insertTestTask" parameterType="TestTask" useGeneratedKeys="true" keyProperty="id">
insert into test_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if>
<if test="groupId != null">group_id,</if>
<if test="projectId != null">project_id,</if>
<if test="crontab != null">crontab,</if>
<if test="status != null">status,</if>
<if test="retry != null">retry,</if>
<if test="retryCount != null">retry_count,</if>
<if test="async != null">async,</if>
<if test="delFlag != null">del_flag,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="groupId != null">#{groupId},</if>
<if test="projectId != null">#{projectId},</if>
<if test="crontab != null">#{crontab},</if>
<if test="status != null">#{status},</if>
<if test="retry != null">#{retry},</if>
<if test="retryCount != null">#{retryCount},</if>
<if test="async != null">#{async},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateTestTask" parameterType="TestTask">
update test_task
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="groupId != null">group_id = #{groupId},</if>
<if test="projectId != null">project_id = #{projectId},</if>
<if test="crontab != null">crontab = #{crontab},</if>
<if test="status != null">status = #{status},</if>
<if test="retry != null">retry = #{retry},</if>
<if test="retryCount != null">retry_count = #{retryCount},</if>
<if test="async != null">async = #{async},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTestTaskById" parameterType="Long">
delete from test_task where id = #{id}
</delete>
<delete id="deleteTestTaskByIds" parameterType="String">
delete from test_task where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>