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

Merge branch 'master' of https://github.com/metersphere/server

This commit is contained in:
chenjianxing 2020-06-28 20:43:58 +08:00
parent 94dbd9ca17 3f00363e6f
commit 1f39b8fe4a
9 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/commons/constants/ReportKeys.java
View File

@ -1,6 +1,6 @@
package io.metersphere.commons.constants;
public enum ReportKeys {
LoadChart, ResponseTimeChart, Errors, ErrorsTop5, RequestStatistics, Overview, TimeInfo
LoadChart, ResponseTimeChart, Errors, ErrorsTop5, RequestStatistics, Overview, TimeInfo, ResultStatus
}

12
backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
View File

@ -5,10 +5,7 @@ import io.metersphere.base.mapper.*;
import io.metersphere.base.mapper.ext.ExtLoadTestMapper;
import io.metersphere.base.mapper.ext.ExtLoadTestReportDetailMapper;
import io.metersphere.base.mapper.ext.ExtLoadTestReportMapper;
import io.metersphere.commons.constants.APITestStatus;
import io.metersphere.commons.constants.PerformanceTestStatus;
import io.metersphere.commons.constants.ScheduleGroup;
import io.metersphere.commons.constants.ScheduleType;
import io.metersphere.commons.constants.*;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.commons.utils.ServiceUtils;
@ -281,6 +278,13 @@ public class PerformanceTestService {
loadTestReportDetailMapper.insertSelective(reportDetail);
// append \n
extLoadTestReportDetailMapper.appendLine(testReport.getId(), "\n");
// 保存一个 reportStatus
LoadTestReportResult reportResult = new LoadTestReportResult();
reportResult.setId(UUID.randomUUID().toString());
reportResult.setReportId(testReport.getId());
reportResult.setReportKey(ReportKeys.ResultStatus.name());
reportResult.setReportValue("Ready"); // 初始化一个 result_status, 这个值用在data-streaming中
loadTestReportResultMapper.insertSelective(reportResult);
} catch (MSException e) {
LogUtil.error(e);
loadTest.setStatus(PerformanceTestStatus.Error.name());

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

@ -25,11 +25,10 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Resource;
@Service
@Transactional(rollbackFor = Exception.class)
public class ReportService {
@ -154,11 +153,7 @@ public class ReportService {
public void checkReportStatus(String reportId) {
LoadTestReport loadTestReport = loadTestReportMapper.selectByPrimaryKey(reportId);
String reportStatus = loadTestReport.getStatus();
if (StringUtils.equals(PerformanceTestStatus.Running.name(), reportStatus)) {
MSException.throwException("Reporting in progress...");
} else if (StringUtils.equals(PerformanceTestStatus.Reporting.name(), reportStatus)) {
MSException.throwException("Reporting in progress...");
} else if (StringUtils.equals(PerformanceTestStatus.Error.name(), reportStatus)) {
if (StringUtils.equals(PerformanceTestStatus.Error.name(), reportStatus)) {
MSException.throwException("Report generation error!");
}
}

6
frontend/src/business/components/performance/report/PerformanceReportView.vue
View File

@ -136,11 +136,7 @@
this.$warning(this.$t('report.start_status'));
break;
case 'Reporting':
this.$info(this.$t('report.being_generated'));
break;
case 'Running':
this.$warning(this.$t('report.run_status'));
break;
case 'Completed':
default:
break;
@ -165,7 +161,7 @@
this.$set(this.report, "id", this.reportId);
this.$set(this.report, "status", data.status);
this.checkReportStatus(data.status);
if (this.status === "Completed") {
if (this.status === "Completed" || this.status === "Running") {
this.initReportTimeInfo();
}
})

2
frontend/src/business/components/performance/report/components/ErrorLog.vue
View File

@ -155,7 +155,7 @@
handler(val) {
let status = val.status;
this.id = val.id;
if (status === "Completed") {
if (status === "Completed" || status === "Running") {
this.initTableData();
} else {
this.tableData = [];

2
frontend/src/business/components/performance/report/components/LogDetails.vue
View File

@ -81,7 +81,7 @@
handler(val) {
let status = val.status;
this.id = val.id;
if (status === "Completed") {
if (status === "Completed" || status === "Running") {
this.getResource();
} else {
this.resource = [];

2
frontend/src/business/components/performance/report/components/RequestStatistics.vue
View File

@ -161,7 +161,7 @@
handler(val){
let status = val.status;
this.id = val.id;
if (status === "Completed") {
if (status === "Completed" || status === "Running") {
this.initTableData();
} else {
this.tableData = [];

2
frontend/src/business/components/performance/report/components/TestOverview.vue
View File

@ -327,7 +327,7 @@
handler(val) {
let status = val.status;
this.id = val.id;
if (status === "Completed") {
if (status === "Completed" || status === "Running") {
this.initTableData();
} else {
this.maxUsers = '0';

4
frontend/src/business/components/track/plan/view/comonents/test/PerformanceTestResult.vue
View File

@ -151,11 +151,7 @@
this.$warning(this.$t('report.start_status'));
break;
case 'Reporting':
this.$info(this.$t('report.being_generated'));
break;
case 'Running':
this.$warning(this.$t('report.run_status'));
break;
case 'Completed':
default:
break;