test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(工作台): 修复接口定义接口用例待更新查询分页失败问题 

https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001018306
--user=郭雨琦
This commit is contained in:
guoyuqi 2022-10-18 11:22:22 +08:00 committed by f2c-ci-robot[bot]
parent edbbed011b
commit f0fc806904
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api-test/backend/src/main/java/io/metersphere/controller/definition/ApiDefinitionController.java
View File

@ -66,6 +66,7 @@ public class ApiDefinitionController {
@RequiresPermissions("PROJECT_API_DEFINITION:READ")
public Pager<List<ApiDefinitionResult>> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiDefinitionRequest request) {
apiDefinitionService.checkFilterHasCoverage(request);
apiDefinitionService.getApplicationUpdateRule(request);
Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
return PageUtils.setPageInfo(page, apiDefinitionService.list(request));
}

1
api-test/backend/src/main/java/io/metersphere/controller/definition/ApiTestCaseController.java
View File

@ -71,6 +71,7 @@ public class ApiTestCaseController {
public Pager<List<ApiTestCaseDTO>> listSimple(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody ApiTestCaseRequest request) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
request.setSelectEnvironment(true);
apiTestCaseService.initRequestBySearch(request);
return PageUtils.setPageInfo(page, apiTestCaseService.listSimple(request));
}

21
api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionService.java
View File

@ -173,13 +173,6 @@ public class ApiDefinitionService {
private static final String SCHEDULE = "schedule";
public List<ApiDefinitionResult> list(ApiDefinitionRequest request) {
// 来自工作台条件
if (BooleanUtils.isTrue(request.getToBeUpdated())) {
Long toBeUpdatedTime = apiTestCaseService.getToBeUpdatedTime(request.getProjectId());
if (toBeUpdatedTime != null) {
request.setToBeUpdateTime(toBeUpdatedTime);
}
}
request = this.initRequest(request, true, true);
List<ApiDefinitionResult> resList = extApiDefinitionMapper.list(request);
buildUserInfo(resList);
@ -193,6 +186,20 @@ public class ApiDefinitionService {
return resList;
}
/**
* 工作台获取待应用管理设置的更新的条件
* @param request
*/
public void getApplicationUpdateRule(ApiDefinitionRequest request){
// 来自工作台条件
if (BooleanUtils.isTrue(request.getToBeUpdated())) {
Long toBeUpdatedTime = apiTestCaseService.getToBeUpdatedTime(request.getProjectId());
if (toBeUpdatedTime != null) {
request.setToBeUpdateTime(toBeUpdatedTime);
}
}
}
public List<ApiDefinition> selectByIds(ApiDefinitionRequest request) {
if (request != null) {
return selectByIds(request.getIds());

6
api-test/backend/src/main/java/io/metersphere/service/definition/ApiTestCaseService.java
View File

@ -144,8 +144,6 @@ public class ApiTestCaseService {
}
public List<ApiTestCaseDTO> listSimple(ApiTestCaseRequest request) {
//工作台逻辑
initRequestBySearch(request);
request = this.initRequest(request, true, true);
List<ApiTestCaseDTO> apiTestCases = extApiTestCaseMapper.listSimple(request);
if (CollectionUtils.isEmpty(apiTestCases)) {
@ -1117,6 +1115,10 @@ public class ApiTestCaseService {
return extApiTestCaseMapper.selectExecuteResultByProjectId(projectId);
}
/**
* 工作台查询应用管理里设置的用例待更新条件
* @param request
*/
public void initRequestBySearch(ApiTestCaseRequest request) {
if (!request.isToBeUpdated()) {
return;