diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java index 87d6e618ce..f354f38a9f 100644 --- a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java +++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java @@ -1,8 +1,13 @@ package io.metersphere.api.controller; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.metersphere.api.service.ApiTestEnvironmentService; import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs; import io.metersphere.commons.constants.RoleConstants; +import io.metersphere.commons.utils.PageUtils; +import io.metersphere.commons.utils.Pager; +import io.metersphere.controller.request.EnvironmentRequest; import io.metersphere.service.CheckPermissionService; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -27,6 +32,23 @@ public class ApiTestEnvironmentController { return apiTestEnvironmentService.list(projectId); } + /** + * 查询指定项目和指定名称的环境 + * @param goPage + * @param pageSize + * @param environmentRequest + * @return + */ + @PostMapping("/list/{goPage}/{pageSize}") + public Pager> listByCondition(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody EnvironmentRequest environmentRequest) { + List projectIds = environmentRequest.getProjectIds(); + for (String projectId : projectIds) { + checkPermissionService.checkProjectOwner(projectId); + } + Page page = PageHelper.startPage(goPage, pageSize, true); + return PageUtils.setPageInfo(page, apiTestEnvironmentService.listByConditions(environmentRequest)); + } + @GetMapping("/get/{id}") public ApiTestEnvironmentWithBLOBs get(@PathVariable String id) { return apiTestEnvironmentService.get(id); diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java index 1557d1c51b..88950302f2 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java @@ -7,6 +7,7 @@ import io.metersphere.base.domain.ApiTestEnvironmentExample; import io.metersphere.base.domain.ApiTestEnvironmentWithBLOBs; import io.metersphere.base.mapper.ApiTestEnvironmentMapper; import io.metersphere.commons.exception.MSException; +import io.metersphere.controller.request.EnvironmentRequest; import io.metersphere.i18n.Translator; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -31,6 +32,17 @@ public class ApiTestEnvironmentService { return apiTestEnvironmentMapper.selectByExampleWithBLOBs(example); } + public List listByConditions(EnvironmentRequest environmentRequest) { + ApiTestEnvironmentExample example = new ApiTestEnvironmentExample(); + ApiTestEnvironmentExample.Criteria criteria = example.createCriteria(); + criteria.andProjectIdIn(environmentRequest.getProjectIds()); + if (StringUtils.isNotBlank(environmentRequest.getName())) { + environmentRequest.setName(StringUtils.wrapIfMissing(environmentRequest.getName(),'%')); //使搜索文本变成数据库中的正则表达式 + criteria.andNameLike(environmentRequest.getName()); + } + return apiTestEnvironmentMapper.selectByExampleWithBLOBs(example); + } + public List selectByExampleWithBLOBs(ApiTestEnvironmentExample example) { return apiTestEnvironmentMapper.selectByExampleWithBLOBs(example); } diff --git a/backend/src/main/java/io/metersphere/controller/request/EnvironmentRequest.java b/backend/src/main/java/io/metersphere/controller/request/EnvironmentRequest.java new file mode 100644 index 0000000000..800435bd69 --- /dev/null +++ b/backend/src/main/java/io/metersphere/controller/request/EnvironmentRequest.java @@ -0,0 +1,14 @@ +package io.metersphere.controller.request; + +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +public class EnvironmentRequest { + + private String name; //查询时的环境名称条件 + private List projectIds; +} diff --git a/frontend/src/business/components/settings/project/EnvironmentList.vue b/frontend/src/business/components/settings/project/EnvironmentList.vue index 2fd2f226ba..e78f6172b8 100644 --- a/frontend/src/business/components/settings/project/EnvironmentList.vue +++ b/frontend/src/business/components/settings/project/EnvironmentList.vue @@ -14,9 +14,8 @@ - - + - - - + @@ -126,7 +124,7 @@ return { btnTips: this.$t('api_test.environment.create'), projectList: [], - condition: {envName: ''}, //用于搜索框 + condition: {}, //封装传递给后端的查询条件 environments: [], currentEnvironment: new Environment(), result: {}, @@ -138,20 +136,21 @@ isTesterPermission: false, domainVisible: false, conditions: [], + currentPage: 1, + pageSize: 10, + total: 0, + projectIds: [], //当前工作空间所拥有的所有项目id } }, - computed: { - searchText() { //搜索框的文本 - return this.condition.name; - }, - /* - 搜索后对应的总条目。搜索内容为空的话就是全部记录条数；搜索内容不为空的话就是匹配的记录条数 - */ - total() { - return this.environments - .filter(env => !this.searchText || env.name.toLowerCase().includes(this.searchText.toLowerCase())).length; - }, + created() { + this.isTesterPermission = checkoutTestManagerOrTestUser(); + }, + + activated() { + this.list(); + }, + watch: { //当创建及复制环境所选择的项目变化时，改变当前环境对应的projectId currentProjectId() { @@ -203,22 +202,26 @@ } }, list() { - this.environments = []; - let url = "/project/listAll"; - this.result = this.$get(url, (response) => { //请求未成功怎么办？ - this.projectList = response.data; //获取当前工作空间所拥有的项目, - this.projectList.forEach(project => { - this.idNameMap.set(project.id, project.name); - }); - //获取每个项目所对应的环境列表 - this.projectList.map((project) => { - this.$get('/api/environment/list/' + project.id, response => { - let envData = response.data; - envData.forEach(env => { - this.environments.push(env); - }) - }) + if (!this.projectList || this.projectList.length === 0) { //没有项目数据的话请求项目数据 + this.$get("/project/listAll", (response) => { + this.projectList = response.data; //获取当前工作空间所拥有的项目, + this.projectList.forEach(project => { + this.idNameMap.set(project.id, project.name); + this.projectIds.push(project.id); + }); + this.getEnvironments(); }) + } else { + this.getEnvironments() + } + }, + getEnvironments(){ + this.environments = []; + this.condition.projectIds = this.projectIds; + let url = '/api/environment/list/' + this.currentPage + '/' + this.pageSize; + this.result = this.$post(url, this.condition, response => { + this.environments = response.data.listObject; + this.total = response.data.itemCount; }) }, createEnv() { @@ -227,7 +230,8 @@ this.dialogVisible = true; this.currentEnvironment = new Environment(); }, - search(searchText) { + search() { + this.list() }, editEnv(environment) { this.dialogTitle = this.$t('api_test.environment.config_environment'); @@ -334,13 +338,7 @@ } }, - created() { - this.isTesterPermission = checkoutTestManagerOrTestUser(); - }, - activated() { - this.list(); - }, }