diff --git a/README.md b/README.md index 5097333a18..4f2028ca2e 100755 --- a/README.md +++ b/README.md @@ -15,11 +15,12 @@ MeterSphere 是一站式的开源企业级持续测试平台,涵盖测试跟 ![产品定位](https://metersphere.io/images/icon/ct-devops.png) -UI 展示: +> 如需进一步了解 MeterSphere 开源项目,推荐阅读 [MeterSphere 的初心和使命](https://mp.weixin.qq.com/s/DpCt3BNgBTlV3sJ5qtPmZw) + +## UI 展示 ![UI](https://metersphere.io/images/screenshot/ss07.png) - ## 快速开始 仅需两步快速安装 MeterSphere: @@ -191,6 +192,7 @@ v1.1.0 是 v1.0.0 之后的功能版本。 - 测试引擎: [JMeter](https://jmeter.apache.org/) ## 加入 MeterSphere 团队 + 我们正在招聘 MeterSphere 技术布道师,一起打造开源明星项目,请发简历到 metersphere@fit2cloud.com 点击查看 [岗位详情](https://www.zhipin.com/job_detail/b151c4b3d594688733Ny3dy1GFI~.html) diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java index 39c05e6652..69d82379c1 100644 --- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java +++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java @@ -49,10 +49,6 @@ public class APITestController { return apiTestService.getApiTestByProjectId(projectId); } - @GetMapping("/state/get/{testId}") - public ApiTest apiState(@PathVariable String testId) { - return apiTestService.getApiTestByTestId(testId); - } @PostMapping(value = "/schedule/update") public void updateSchedule(@RequestBody Schedule request) { diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java index 12f763e550..9e48420f56 100644 --- a/backend/src/main/java/io/metersphere/api/service/APITestService.java +++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java @@ -128,9 +128,6 @@ public class APITestService { return null; } - public ApiTest getApiTestByTestId(String testId) { - return apiTestMapper.selectByPrimaryKey(testId); - } public List getApiTestByProjectId(String projectId) { return extApiTestMapper.getApiTestByProjectId(projectId); diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCase.java b/backend/src/main/java/io/metersphere/base/domain/TestCase.java index 05d44ff62f..1857b2a7b2 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCase.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCase.java @@ -35,5 +35,7 @@ public class TestCase implements Serializable { private Integer num; + private String otherTestName; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java index 2387f5207a..1ff860c2c1 100644 --- a/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/TestCaseExample.java @@ -1113,6 +1113,76 @@ public class TestCaseExample { addCriterion("num not between", value1, value2, "num"); return (Criteria) this; } + + public Criteria andOtherTestNameIsNull() { + addCriterion("other_test_name is null"); + return (Criteria) this; + } + + public Criteria andOtherTestNameIsNotNull() { + addCriterion("other_test_name is not null"); + return (Criteria) this; + } + + public Criteria andOtherTestNameEqualTo(String value) { + addCriterion("other_test_name =", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameNotEqualTo(String value) { + addCriterion("other_test_name <>", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameGreaterThan(String value) { + addCriterion("other_test_name >", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameGreaterThanOrEqualTo(String value) { + addCriterion("other_test_name >=", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameLessThan(String value) { + addCriterion("other_test_name <", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameLessThanOrEqualTo(String value) { + addCriterion("other_test_name <=", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameLike(String value) { + addCriterion("other_test_name like", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameNotLike(String value) { + addCriterion("other_test_name not like", value, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameIn(List values) { + addCriterion("other_test_name in", values, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameNotIn(List values) { + addCriterion("other_test_name not in", values, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameBetween(String value1, String value2) { + addCriterion("other_test_name between", value1, value2, "otherTestName"); + return (Criteria) this; + } + + public Criteria andOtherTestNameNotBetween(String value1, String value2) { + addCriterion("other_test_name not between", value1, value2, "otherTestName"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml index eb6cbdee82..aa1548a110 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/TestCaseMapper.xml @@ -17,6 +17,7 @@ + @@ -82,7 +83,7 @@ id, node_id, node_path, project_id, `name`, `type`, maintainer, priority, `method`, - prerequisite, create_time, update_time, test_id, sort, num + prerequisite, create_time, update_time, test_id, sort, num, other_test_name remark, steps @@ -141,13 +142,15 @@ maintainer, priority, `method`, prerequisite, create_time, update_time, test_id, sort, num, - remark, steps) + other_test_name, remark, steps + ) values (#{id,jdbcType=VARCHAR}, #{nodeId,jdbcType=VARCHAR}, #{nodePath,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{maintainer,jdbcType=VARCHAR}, #{priority,jdbcType=VARCHAR}, #{method,jdbcType=VARCHAR}, #{prerequisite,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{testId,jdbcType=VARCHAR}, #{sort,jdbcType=INTEGER}, #{num,jdbcType=INTEGER}, - #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR}) + #{otherTestName,jdbcType=VARCHAR}, #{remark,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR} + ) insert into test_case @@ -197,6 +200,9 @@ num, + + other_test_name, + remark, @@ -250,6 +256,9 @@ #{num,jdbcType=INTEGER}, + + #{otherTestName,jdbcType=VARCHAR}, + #{remark,jdbcType=LONGVARCHAR}, @@ -312,6 +321,9 @@ num = #{record.num,jdbcType=INTEGER}, + + other_test_name = #{record.otherTestName,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=LONGVARCHAR}, @@ -340,6 +352,7 @@ test_id = #{record.testId,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=INTEGER}, num = #{record.num,jdbcType=INTEGER}, + other_test_name = #{record.otherTestName,jdbcType=VARCHAR}, remark = #{record.remark,jdbcType=LONGVARCHAR}, steps = #{record.steps,jdbcType=LONGVARCHAR} @@ -362,7 +375,8 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, test_id = #{record.testId,jdbcType=VARCHAR}, sort = #{record.sort,jdbcType=INTEGER}, - num = #{record.num,jdbcType=INTEGER} + num = #{record.num,jdbcType=INTEGER}, + other_test_name = #{record.otherTestName,jdbcType=VARCHAR} @@ -412,6 +426,9 @@ num = #{num,jdbcType=INTEGER}, + + other_test_name = #{otherTestName,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=LONGVARCHAR}, @@ -437,6 +454,7 @@ test_id = #{testId,jdbcType=VARCHAR}, sort = #{sort,jdbcType=INTEGER}, num = #{num,jdbcType=INTEGER}, + other_test_name = #{otherTestName,jdbcType=VARCHAR}, remark = #{remark,jdbcType=LONGVARCHAR}, steps = #{steps,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} @@ -456,7 +474,8 @@ update_time = #{updateTime,jdbcType=BIGINT}, test_id = #{testId,jdbcType=VARCHAR}, sort = #{sort,jdbcType=INTEGER}, - num = #{num,jdbcType=INTEGER} + num = #{num,jdbcType=INTEGER}, + other_test_name = #{otherTestName,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml index 4c3193bbe8..1ae50558f5 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml @@ -225,7 +225,12 @@ - order by update_time desc + + order by + + ${order.name} ${order.type} + +