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

fix(接口测试): 解决首页停止定时任务问题 

--user=郭雨琦
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001016708
This commit is contained in:
guoyuqi 2022-09-13 18:44:18 +08:00 committed by f2c-ci-robot[bot]
parent 4324b427eb
commit 4b036fa8c3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend/src/main/java/io/metersphere/service/ScheduleService.java
View File

@ -23,6 +23,7 @@ import io.metersphere.log.utils.ReflexObjectUtil;
import io.metersphere.log.vo.DetailColumn; import io.metersphere.log.vo.DetailColumn;
import io.metersphere.log.vo.OperatingLogDetails; import io.metersphere.log.vo.OperatingLogDetails;
import io.metersphere.log.vo.schedule.ScheduleReference; import io.metersphere.log.vo.schedule.ScheduleReference;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.quartz.JobKey; import org.quartz.JobKey;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
@ -91,9 +92,9 @@ public class ScheduleService {
return null; return null;
} }
public List<Schedule> getScheduleByResourceIds(List<String>resourceIds, String group) { public List<Schedule> getScheduleByResourceIds(List<String> resourceIds, String group) {
ScheduleExample example = new ScheduleExample(); ScheduleExample example = new ScheduleExample();
if(resourceIds.size()==0){ if (CollectionUtils.isEmpty(resourceIds)) {
return new ArrayList<>(); return new ArrayList<>();
} }
example.createCriteria().andResourceIdIn(resourceIds).andGroupEqualTo(group); example.createCriteria().andResourceIdIn(resourceIds).andGroupEqualTo(group);
@ -194,7 +195,7 @@ public class ScheduleService {
LogUtil.error(e); LogUtil.error(e);
MSException.throwException("重置定时任务-删除旧定时任务时出现异常"); MSException.throwException("重置定时任务-删除旧定时任务时出现异常");
} }
if(!request.getEnable()){ if (!request.getEnable()) {
return; return;
} }
try { try {
@ -315,6 +316,12 @@ public class ScheduleService {
clazz = TestPlanTestJob.class; clazz = TestPlanTestJob.class;
request.setJob(TestPlanTestJob.class.getName()); request.setJob(TestPlanTestJob.class.getName());
needResetJob = true; needResetJob = true;
} else if (ScheduleGroup.SWAGGER_IMPORT.name().equals(request.getGroup())) {
jobKey = SwaggerUrlImportJob.getJobKey(request.getResourceId());
triggerKey = SwaggerUrlImportJob.getTriggerKey(request.getResourceId());
clazz = SwaggerUrlImportJob.class;
request.setJob(SwaggerUrlImportJob.class.getName());
needResetJob = true;
} else { } else {
//默认为情景 //默认为情景
jobKey = ApiScenarioTestJob.getJobKey(request.getResourceId()); jobKey = ApiScenarioTestJob.getJobKey(request.getResourceId());

1
frontend/src/business/components/api/homepage/components/ApiRunningTaskList.vue
View File

@ -141,7 +141,6 @@ export default {
}, },
updateTask(taskRow) { updateTask(taskRow) {
this.result = this.$post('/api/schedule/updateEnableByPrimyKey/disable', taskRow, response => { this.result = this.$post('/api/schedule/updateEnableByPrimyKey/disable', taskRow, response => {
this.search(); this.search();
}); });