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

fix(场景报告存储): 更改场景报告存储的逻辑 

更改场景报告存储的逻辑,完善日志输出的内容
This commit is contained in:
song-tianyang 2021-12-16 11:22:04 +08:00 committed by song-tianyang
parent 5f179a5018
commit 205d24734b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
View File

@ -321,6 +321,7 @@ public class ApiScenarioReportService {
if (CollectionUtils.isNotEmpty(scenarioResult.getRequestResults())) {
startTime = scenarioResult.getRequestResults().get(0).getStartTime();
}
String resultReportId = scenarioResult.getName();
ApiScenarioReport report = editReport(scenarioResult, startTime);
if (report != null) {
TestResult newResult = createTestResult(result.getTestId(), scenarioResult);
@ -383,12 +384,13 @@ public class ApiScenarioReportService {
if (StringUtils.isNotEmpty(report.getTriggerMode()) && report.getTriggerMode().equals("CASE")) {
report.setTriggerMode(TriggerMode.MANUAL.name());
}
if (StringUtils.equalsIgnoreCase(report.getId(), scenarioResult.getName())) {
if (StringUtils.equalsIgnoreCase(report.getId(), resultReportId)) {
detail.setReportId(report.getId());
} else {
detail.setReportId(scenarioResult.getName());
LogUtil.info("ReportId" + scenarioResult.getName() + " has changed!");
LogUtil.error("ReportId was changed. ScenarioResultData:" + JSON.toJSONString(scenarioResult) + "; ApiScenarioReport:" + JSON.toJSONString(report));
detail.setReportId(resultReportId);
LogUtil.info("ReportId" + resultReportId + " has changed!");
LogUtil.error("ReportId was changed. ScenarioResultData:" + JSON.toJSONString(scenarioResult) + ";\r\n " +
"ApiScenarioReport:" + JSON.toJSONString(report));
}
try {