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-03-12 14:55:59 +08:00
parent 7e9cf5b292
commit a0d7b33323
8 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -20,6 +20,7 @@ import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.controller.request.QueryScheduleRequest;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.dto.ScheduleDao;
import io.metersphere.performance.service.PerformanceTestService;
import io.metersphere.service.CheckPermissionService;
@ -104,7 +105,7 @@ public class APITestController {
}
@PostMapping(value = "/schedule/create")
public void createSchedule(@RequestBody Schedule request) {
public void createSchedule(@RequestBody ScheduleRequest request) {
apiTestService.createSchedule(request);
}

3
backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java
View File

@ -16,6 +16,7 @@ import io.metersphere.commons.constants.RoleConstants;
import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
import io.metersphere.track.request.testplan.FileOperationRequest;
import org.apache.shiro.authz.annotation.Logical;
@ -149,7 +150,7 @@ public class ApiAutomationController {
}
@PostMapping(value = "/schedule/create")
public void createSchedule(@RequestBody Schedule request) {
public void createSchedule(@RequestBody ScheduleRequest request) {
apiAutomationService.createSchedule(request);
}

3
backend/src/main/java/io/metersphere/api/controller/ApiDefinitionController.java
View File

@ -20,6 +20,7 @@ import io.metersphere.commons.utils.CronUtils;
import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.service.CheckPermissionService;
import io.metersphere.service.ScheduleService;
import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
@ -156,7 +157,7 @@ public class ApiDefinitionController {
//定时任务创建
@PostMapping(value = "/schedule/create")
public void createSchedule(@RequestBody Schedule request) {
public void createSchedule(@RequestBody ScheduleRequest request) {
apiDefinitionService.createSchedule(request);
}
@PostMapping(value = "/schedule/update")

5
backend/src/main/java/io/metersphere/api/service/APITestService.java
View File

@ -21,6 +21,7 @@ import io.metersphere.commons.constants.ScheduleType;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*;
import io.metersphere.controller.request.QueryScheduleRequest;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.dto.ScheduleDao;
import io.metersphere.i18n.Translator;
import io.metersphere.job.sechedule.ApiTestJob;
@ -328,12 +329,12 @@ public class APITestService {
addOrUpdateApiTestCronJob(request);
}
public void createSchedule(Schedule request) {
public void createSchedule(ScheduleRequest request) {
scheduleService.addSchedule(buildApiTestSchedule(request));
addOrUpdateApiTestCronJob(request);
}
private Schedule buildApiTestSchedule(Schedule request) {
private Schedule buildApiTestSchedule(ScheduleRequest request) {
Schedule schedule = scheduleService.buildApiTestSchedule(request);
schedule.setJob(ApiTestJob.class.getName());
schedule.setGroup(ScheduleGroup.API_TEST.name());

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

@ -31,6 +31,7 @@ import io.metersphere.base.mapper.ext.ExtTestPlanScenarioCaseMapper;
import io.metersphere.commons.constants.*;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.i18n.Translator;
import io.metersphere.job.sechedule.ApiScenarioTestJob;
import io.metersphere.job.sechedule.TestPlanTestJob;
@ -717,7 +718,7 @@ public class ApiAutomationService {
return apiScenarioMapper.selectByExampleWithBLOBs(example);
}
public void createSchedule(Schedule request) {
public void createSchedule(ScheduleRequest request) {
Schedule schedule = scheduleService.buildApiTestSchedule(request);
schedule.setJob(ApiScenarioTestJob.class.getName());
schedule.setGroup(ScheduleGroup.API_SCENARIO_TEST.name());

3
backend/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -28,6 +28,7 @@ import io.metersphere.base.mapper.ext.*;
import io.metersphere.commons.constants.*;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.i18n.Translator;
import io.metersphere.job.sechedule.SwaggerUrlImportJob;
import io.metersphere.service.FileService;
@ -702,7 +703,7 @@ public class ApiDefinitionService {
}
/*swagger定时导入*/
public void createSchedule(Schedule request) {
public void createSchedule(ScheduleRequest request) {
/*保存swaggerUrl*/
SwaggerUrlProject swaggerUrlProject = new SwaggerUrlProject();
swaggerUrlProject.setId(UUID.randomUUID().toString());

3
backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
View File

@ -10,6 +10,7 @@ import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.controller.request.QueryScheduleRequest;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.dto.DashboardTestDTO;
import io.metersphere.dto.LoadTestDTO;
import io.metersphere.dto.ScheduleDao;
@ -175,7 +176,7 @@ public class PerformanceTestController {
}
@PostMapping(value = "/schedule/create")
public void createSchedule(@RequestBody Schedule request) {
public void createSchedule(@RequestBody ScheduleRequest request) {
performanceTestService.createSchedule(request);
}

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

@ -14,6 +14,7 @@ import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.config.KafkaProperties;
import io.metersphere.controller.request.OrderRequest;
import io.metersphere.controller.request.QueryScheduleRequest;
import io.metersphere.controller.request.ScheduleRequest;
import io.metersphere.dto.DashboardTestDTO;
import io.metersphere.dto.LoadTestDTO;
import io.metersphere.dto.ScheduleDao;
@ -465,12 +466,12 @@ public class PerformanceTestService {
addOrUpdatePerformanceTestCronJob(request);
}
public void createSchedule(Schedule request) {
public void createSchedule(ScheduleRequest request) {
scheduleService.addSchedule(buildPerformanceTestSchedule(request));
addOrUpdatePerformanceTestCronJob(request);
}
private Schedule buildPerformanceTestSchedule(Schedule request) {
private Schedule buildPerformanceTestSchedule(ScheduleRequest request) {
Schedule schedule = scheduleService.buildApiTestSchedule(request);
schedule.setJob(PerformanceTestJob.class.getName());
schedule.setGroup(ScheduleGroup.PERFORMANCE_TEST.name());