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:
Captain.B 2021-08-25 15:37:09 +08:00 committed by 刘瑞斌
parent 7e82e8cb85
commit 3cac84c2a2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeEvent.java
View File

@ -8,9 +8,11 @@ import io.metersphere.commons.constants.ReportTriggerMode;
import io.metersphere.commons.consumer.LoadTestFinishEvent; import io.metersphere.commons.consumer.LoadTestFinishEvent;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
import io.metersphere.dto.BaseSystemConfigDTO; import io.metersphere.dto.BaseSystemConfigDTO;
import io.metersphere.dto.LoadTestDTO;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import io.metersphere.notice.sender.NoticeModel; import io.metersphere.notice.sender.NoticeModel;
import io.metersphere.notice.service.NoticeSendService; import io.metersphere.notice.service.NoticeSendService;
import io.metersphere.performance.service.PerformanceTestService;
import io.metersphere.service.ProjectService; import io.metersphere.service.ProjectService;
import io.metersphere.service.SystemParameterService; import io.metersphere.service.SystemParameterService;
import org.apache.commons.beanutils.BeanMap; import org.apache.commons.beanutils.BeanMap;
@ -29,6 +31,8 @@ public class PerformanceNoticeEvent implements LoadTestFinishEvent {
private NoticeSendService noticeSendService; private NoticeSendService noticeSendService;
@Resource @Resource
private ProjectService projectService; private ProjectService projectService;
@Resource
private PerformanceTestService performanceTestService;
public void sendNotice(LoadTestReport loadTestReport) { public void sendNotice(LoadTestReport loadTestReport) {
@ -55,11 +59,14 @@ public class PerformanceNoticeEvent implements LoadTestFinishEvent {
if (PerformanceTestStatus.Error.name().equals(loadTestReport.getStatus())) { if (PerformanceTestStatus.Error.name().equals(loadTestReport.getStatus())) {
event = NoticeConstants.Event.EXECUTE_FAILED; event = NoticeConstants.Event.EXECUTE_FAILED;
} }
LoadTestDTO loadTestDTO = performanceTestService.get(loadTestReport.getTestId());
Map paramMap = new HashMap<>(); Map paramMap = new HashMap<>();
paramMap.put("operator", loadTestReport.getUserId()); paramMap.put("operator", loadTestReport.getUserId());
paramMap.put("type", "performance"); paramMap.put("type", "performance");
paramMap.put("url", baseSystemConfigDTO.getUrl()); paramMap.put("url", baseSystemConfigDTO.getUrl());
paramMap.putAll(new BeanMap(loadTestReport)); paramMap.putAll(new BeanMap(loadTestDTO));
NoticeModel noticeModel = NoticeModel.builder() NoticeModel noticeModel = NoticeModel.builder()
.operator(loadTestReport.getUserId()) .operator(loadTestReport.getUserId())
.successContext(successContext) .successContext(successContext)
@ -73,13 +80,13 @@ public class PerformanceNoticeEvent implements LoadTestFinishEvent {
.paramMap(paramMap) .paramMap(paramMap)
.build(); .build();
Organization organization = projectService.getOrganizationByProjectId(loadTestReport.getProjectId());
if (StringUtils.equals(ReportTriggerMode.API.name(), loadTestReport.getTriggerMode()) if (StringUtils.equals(ReportTriggerMode.API.name(), loadTestReport.getTriggerMode())
|| StringUtils.equals(ReportTriggerMode.SCHEDULE.name(), loadTestReport.getTriggerMode())) { || StringUtils.equals(ReportTriggerMode.SCHEDULE.name(), loadTestReport.getTriggerMode())) {
noticeSendService.send(loadTestReport.getTriggerMode(), noticeModel); noticeSendService.send(loadTestReport.getTriggerMode(), noticeModel);
} else { } else {
String context = "${operator}执行了性能测试: ${name}, 执行结果: ${status}"; Organization organization = projectService.getOrganizationByProjectId(loadTestReport.getProjectId());
String context = "${operator}执行性能测试完成: ${name}";
NoticeModel noticeModel2 = NoticeModel.builder() NoticeModel noticeModel2 = NoticeModel.builder()
.operator(loadTestReport.getUserId()) .operator(loadTestReport.getUserId())
.context(context) .context(context)