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

fix: 解决合并1.7的冲突 

解决合并1.7的冲突
This commit is contained in:
song.tianyang 2021-02-17 12:07:18 +08:00
parent d54e6911db
commit 54d6c68dd7
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -550,10 +550,6 @@ public class ApiDefinitionService {
} }
public void editApiByParam(ApiBatchRequest request) { public void editApiByParam(ApiBatchRequest request) {
List<String> ids = request.getIds();
if (request.isSelectAllDate()) {
ids = this.getAllApiIdsByFontedSelect(request.getFilters(), request.getName(), request.getModuleIds(), request.getProjectId(), request.getUnSelectIds(), request.getProtocol());
}
//name在这里只是查询参数 //name在这里只是查询参数
request.setName(null); request.setName(null);
ApiDefinitionWithBLOBs definitionWithBLOBs = new ApiDefinitionWithBLOBs(); ApiDefinitionWithBLOBs definitionWithBLOBs = new ApiDefinitionWithBLOBs();
@ -609,15 +605,6 @@ public class ApiDefinitionService {
return apiDefinitionMapper.selectByExample(example); return apiDefinitionMapper.selectByExample(example);
} }
public void deleteByParams(ApiDefinitionBatchProcessingRequest request) {
List<String> apiIds = request.getDataIds();
if (request.isSelectAllDate()) {
apiIds = this.getAllApiIdsByFontedSelect(request.getFilters(), request.getName(), request.getModuleIds(), request.getProjectId(), request.getUnSelectIds(), request.getProtocol());
}
ApiDefinitionExample example = new ApiDefinitionExample();
example.createCriteria().andIdIn(apiIds);
apiDefinitionMapper.deleteByExample(example);
}
public void deleteByParams(ApiBatchRequest request) { public void deleteByParams(ApiBatchRequest request) {
apiDefinitionMapper.deleteByExample(getBatchExample(request)); apiDefinitionMapper.deleteByExample(getBatchExample(request));
} }
@ -647,16 +634,11 @@ public class ApiDefinitionService {
return ids; return ids;
} }
public void removeToGcByParams(ApiDefinitionBatchProcessingRequest request) { public void removeToGcByParams(ApiBatchRequest request) {
List<String> apiIds = request.getDataIds(); ServiceUtils.getSelectAllIds(request, request.getCondition(),
if (request.isSelectAllDate()) { (query) -> extApiDefinitionMapper.selectIds(query));
apiIds = this.getAllApiIdsByFontedSelect(request.getFilters(), request.getName(), request.getModuleIds(), request.getProjectId(), request.getUnSelectIds(), request.getProtocol()); extApiDefinitionMapper.removeToGc(request.getIds());
}
extApiDefinitionMapper.removeToGc(apiIds);
} }
ApiDefinitionExample example = new ApiDefinitionExample();
example.createCriteria().andIdIn(apiIds);
apiDefinitionMapper.deleteByExample(example);
public List<ApiDefinitionResult> listRelevance(ApiDefinitionRequest request) { public List<ApiDefinitionResult> listRelevance(ApiDefinitionRequest request) {
request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));