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

fix(定时任务通知优化 #1005683): 测试计划的定时任务不会再触发场景定时任务的信息设置 

--bug=1005683 --user=宋天阳 【测试计划】定时任务通知优化
https://www.tapd.cn/55049933/s/1033492
This commit is contained in:
song-tianyang 2021-08-09 11:39:07 +08:00 committed by 刘瑞斌
parent 113f68b734
commit b29ba907e9
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -1368,6 +1368,8 @@ public class ApiAutomationService {
String runMode = ApiRunMode.SCENARIO.name(); String runMode = ApiRunMode.SCENARIO.name();
if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) { if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.SCENARIO_PLAN.name())) {
runMode = ApiRunMode.SCENARIO_PLAN.name(); runMode = ApiRunMode.SCENARIO_PLAN.name();
}else if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.SCHEDULE_SCENARIO.name())) {
runMode = ApiRunMode.SCHEDULE_SCENARIO.name();
} }
if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.DEFINITION.name())) { if (StringUtils.isNotBlank(request.getRunMode()) && StringUtils.equals(request.getRunMode(), ApiRunMode.DEFINITION.name())) {
runMode = ApiRunMode.DEFINITION.name(); runMode = ApiRunMode.DEFINITION.name();

28
backend/src/main/java/io/metersphere/api/service/TestResultService.java
View File

@ -117,20 +117,24 @@ public class TestResultService {
userName = apiAutomationService.getUser(apiScenario.getUserId()); userName = apiAutomationService.getUser(apiScenario.getUserId());
principal = apiAutomationService.getUser(apiScenario.getPrincipal()); principal = apiAutomationService.getUser(apiScenario.getPrincipal());
} }
//报告内容 //报告内容
reportTask = new ApiTestReportVariable(); reportTask = new ApiTestReportVariable();
reportTask.setStatus(scenarioReport.getStatus()); if(StringUtils.equalsAny(runMode, ApiRunMode.SCHEDULE_SCENARIO.name())) {
reportTask.setId(scenarioReport.getId()); reportTask.setStatus(scenarioReport.getStatus());
reportTask.setTriggerMode(scenarioReport.getTriggerMode()); reportTask.setId(scenarioReport.getId());
reportTask.setName(scenarioReport.getName()); reportTask.setTriggerMode(scenarioReport.getTriggerMode());
reportTask.setExecutor(userName); reportTask.setName(scenarioReport.getName());
reportTask.setPrincipal(principal); reportTask.setExecutor(userName);
reportTask.setExecutionTime(DateUtils.getTimeString(scenarioReport.getUpdateTime())); reportTask.setPrincipal(principal);
reportTask.setExecutionEnvironment(name); reportTask.setExecutionTime(DateUtils.getTimeString(scenarioReport.getUpdateTime()));
SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class); reportTask.setExecutionEnvironment(name);
assert systemParameterService != null; SystemParameterService systemParameterService = CommonBeanFactory.getBean(SystemParameterService.class);
BaseSystemConfigDTO baseSystemConfigDTO = systemParameterService.getBaseInfo(); assert systemParameterService != null;
reportUrl = baseSystemConfigDTO.getUrl() + "/#/api/automation/report"; BaseSystemConfigDTO baseSystemConfigDTO = systemParameterService.getBaseInfo();
reportUrl = baseSystemConfigDTO.getUrl() + "/#/api/automation/report";
}
testResult.setTestId(scenarioReport.getScenarioId()); testResult.setTestId(scenarioReport.getScenarioId());
planScenarioId = scenarioReport.getTestPlanScenarioId(); planScenarioId = scenarioReport.getTestPlanScenarioId();
} else { } else {