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

refactor: 测试报告日志查询修改

This commit is contained in:
Captain.B 2020-12-22 12:00:03 +08:00
parent ecfb1cf2fe
commit dcc1df4133
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/performance/service/ReportService.java
View File

@ -193,11 +193,13 @@ public class ReportService {
public List<LogDetailDTO> getReportLogResource(String reportId) {
List<LogDetailDTO> result = new ArrayList<>();
List<String> resourceIds = extLoadTestReportMapper.selectResourceId(reportId);
resourceIds.forEach(resourceId -> {
List<String> resourceIdAndIndexes = extLoadTestReportMapper.selectResourceId(reportId);
resourceIdAndIndexes.forEach(resourceIdAndIndex -> {
LogDetailDTO detailDTO = new LogDetailDTO();
String[] split = StringUtils.split(resourceIdAndIndex, "_");
String resourceId = split[0];
TestResource testResource = testResourceService.getTestResource(resourceId);
detailDTO.setResourceId(resourceId);
detailDTO.setResourceId(resourceIdAndIndex);
if (testResource == null) {
detailDTO.setResourceName(resourceId);
result.add(detailDTO);

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit bb494fc68a2367359c9048fa7250c7618de4afb6
Subproject commit 9f4a9bbf46fc1333dbcccea21f83e27e3ec10b1f

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit a22a3005d9bd254793fcf634d72539cbdf31be3a
Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433