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

fix(性能测试): 性能测试场景CSV变更后进行同步时表格内的CSV文件也同步更改 

--bug=1026666 --user=宋天阳 【性能测试】github#24712，性能测试同步场景后，csv 文件丢失
https://www.tapd.cn/55049933/s/1379053
This commit is contained in:
song-tianyang 2023-06-06 11:12:29 +08:00 committed by 建国
parent 72d52aa89c
commit 7c25533482
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
performance-test/backend/src/main/java/io/metersphere/api/service/ApiPerformanceService.java
View File

@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
@ -124,11 +125,10 @@ public class ApiPerformanceService {
if (!CollectionUtils.isEmpty(scenarioIds)) {
ApiScenarioBatchRequest scenarioRequest = new ApiScenarioBatchRequest();
scenarioRequest.setIds(scenarioIds);
List<ApiScenarioExportJmxDTO> apiScenrioExportJmxes = this.exportJmx(scenarioRequest).getScenarioJmxList();
deleteLoadTestFiles(loadTest.getId());
apiScenrioExportJmxes.forEach(item -> {
List<ApiScenarioExportJmxDTO> apiScenarioExportJmxDTOList = this.exportJmx(scenarioRequest).getScenarioJmxList();
List<String> attachFileIds = this.getScenarioAttachFileIds(apiScenarioExportJmxDTOList);
deleteLoadTestFiles(loadTest.getId(), attachFileIds);
apiScenarioExportJmxDTOList.forEach(item -> {
this.updateVersion(loadTest.getId(), item.getId(), item.getVersion());
saveJmxFile(item.getJmx(), item.getName(), loadTest.getProjectId(), loadTest.getId());
saveOtherFile(item.getFileMetadataList(), loadTest.getId());
@ -136,6 +136,30 @@ public class ApiPerformanceService {
}
}
private List<String> getScenarioAttachFileIds(List<ApiScenarioExportJmxDTO> apiScenarioExportJmxDTOList) {
List<String> returnList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(apiScenarioExportJmxDTOList)) {
for (ApiScenarioExportJmxDTO item : apiScenarioExportJmxDTOList) {
if (CollectionUtils.isNotEmpty(item.getFileMetadataList())) {
returnList.addAll(item.getFileMetadataList().stream().map(FileMetadata::getId).toList());
}
}
}
return returnList;
}
private List<String> getAttachFileIds(List<JmxInfoDTO> jmxInfoDTOS) {
List<String> returnList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(jmxInfoDTOS)) {
for (JmxInfoDTO item : jmxInfoDTOS) {
if (CollectionUtils.isNotEmpty(item.getFileMetadataList())) {
returnList.addAll(item.getFileMetadataList().stream().map(FileMetadata::getId).toList());
}
}
}
return returnList;
}
public void syncApiCase(LoadTestWithBLOBs loadTest, List<ApiLoadTest> apiLoadTests) {
List<String> caseIds = apiLoadTests.stream()
.filter(i -> i.getType().equals(ApiLoadType.API_CASE.name()))
@ -146,7 +170,8 @@ public class ApiPerformanceService {
request.setCaseIds(caseIds);
request.setEnvId(apiLoadTests.get(0).getEnvId());
List<JmxInfoDTO> jmxInfoDTOS = this.exportApiCaseJmx(request);
deleteLoadTestFiles(loadTest.getId());
List<String> attachmentFileIds = this.getAttachFileIds(jmxInfoDTOS);
deleteLoadTestFiles(loadTest.getId(), attachmentFileIds);
jmxInfoDTOS.forEach(item -> {
this.updateVersion(loadTest.getId(), item.getId(), item.getVersion());
saveJmxFile(item.getXml(), item.getName(), loadTest.getProjectId(), loadTest.getId());
@ -207,9 +232,12 @@ public class ApiPerformanceService {
}
}
private void deleteLoadTestFiles(String testId) {
private void deleteLoadTestFiles(String testId, List<String> notDeleteFileIds) {
List<FileMetadata> originFiles = extLoadTestMapper.getFileMetadataByIds(testId);
List<String> originFileIds = originFiles.stream().map(FileMetadata::getId).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(notDeleteFileIds)) {
originFileIds.removeAll(notDeleteFileIds);
}
LoadTestFileExample example = new LoadTestFileExample();
example.createCriteria().andTestIdEqualTo(testId);
loadTestFileMapper.deleteByExample(example);