From e019033baa8285e7a2608b0bc9bb60a4538fa791 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Wed, 26 Oct 2022 10:45:44 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?= =?UTF-8?q?=E5=BC=95=E7=94=A8xpack=E7=B1=BB=E6=89=93=E5=8C=85=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../remote/TrackApiDefinitionController.java | 2 +- .../request/api/ApiDefinitionRequest.java | 54 +++++++++++++++++++ .../remote/api/PlanApiDefinitionService.java | 2 +- 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 test-track/backend/src/main/java/io/metersphere/plan/request/api/ApiDefinitionRequest.java diff --git a/test-track/backend/src/main/java/io/metersphere/controller/remote/TrackApiDefinitionController.java b/test-track/backend/src/main/java/io/metersphere/controller/remote/TrackApiDefinitionController.java index 5b4c6f995d..9996fc44f1 100644 --- a/test-track/backend/src/main/java/io/metersphere/controller/remote/TrackApiDefinitionController.java +++ b/test-track/backend/src/main/java/io/metersphere/controller/remote/TrackApiDefinitionController.java @@ -1,7 +1,7 @@ package io.metersphere.controller.remote; +import io.metersphere.plan.request.api.ApiDefinitionRequest; import io.metersphere.plan.service.remote.api.PlanApiDefinitionService; -import io.metersphere.xpack.api.dto.request.ApiDefinitionRequest; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/test-track/backend/src/main/java/io/metersphere/plan/request/api/ApiDefinitionRequest.java b/test-track/backend/src/main/java/io/metersphere/plan/request/api/ApiDefinitionRequest.java new file mode 100644 index 0000000000..1342fcfbc1 --- /dev/null +++ b/test-track/backend/src/main/java/io/metersphere/plan/request/api/ApiDefinitionRequest.java @@ -0,0 +1,54 @@ +package io.metersphere.plan.request.api; + +import io.metersphere.request.ApiSyncCaseRequest; +import io.metersphere.request.BaseQueryRequest; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +public class ApiDefinitionRequest extends BaseQueryRequest { + + private String id; + private String excludeId; + private String moduleId; + private String module; + private String protocol; + private String name; + private String userId; + private String planId; + private boolean recent = false; + private boolean isSelectThisWeedData = false; + private long createTime = 0; + private String status; + private String apiCoverage; + private String apiCaseCoverage; + private String scenarioCoverage; + private String reviewId; + private String refId; + private String versionId; + private String path; + private String method; + + //被场景覆盖的接口id集合 + private List coverageIds; + + // 测试计划是否允许重复 + private boolean repeatCase; + //是否进入待更新列表 + private Boolean toBeUpdated; + + //当前时间减去进入待更新的时间 + private Long toBeUpdateTime; + + //同步配置 + private ApiSyncCaseRequest syncConfig; + + //全选 + private boolean selectAll; + + private Long deleteTime; + private String deleteUserId; +} diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiDefinitionService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiDefinitionService.java index d8d04cbdf8..0ef9461b37 100644 --- a/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiDefinitionService.java +++ b/test-track/backend/src/main/java/io/metersphere/plan/service/remote/api/PlanApiDefinitionService.java @@ -1,7 +1,7 @@ package io.metersphere.plan.service.remote.api; +import io.metersphere.plan.request.api.ApiDefinitionRequest; import io.metersphere.plan.service.TestPlanService; -import io.metersphere.xpack.api.dto.request.ApiDefinitionRequest; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service;