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

fix(系统设置): 任务中心开启定时任务不生效 

--bug=1044324 --user=陈建星 【系统设置】任务中心-定时任务-测试计划-列表中手动修改测试计划组的定时任务运行规则不生效 https://www.tapd.cn/55049933/s/1552871
This commit is contained in:
AgAngle 2024-07-23 20:03:12 +08:00 committed by 刘瑞斌
parent b32fa76625
commit 9d81ed8737
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/services/system-setting/src/main/java/io/metersphere/system/service/TaskCenterService.java
View File

@ -9,6 +9,7 @@ import io.metersphere.sdk.constants.PermissionConstants;
import io.metersphere.sdk.constants.TaskCenterResourceType;
import io.metersphere.sdk.exception.MSException;
import io.metersphere.sdk.util.DateUtils;
import io.metersphere.sdk.util.LogUtils;
import io.metersphere.sdk.util.SubListUtils;
import io.metersphere.sdk.util.Translator;
import io.metersphere.system.domain.Organization;
@ -208,9 +209,9 @@ public class TaskCenterService {
private static String getLogModule(String moduleType, String module) {
return switch (ScheduleTagType.valueOf(moduleType)) {
case ScheduleTagType.API_IMPORT -> StringUtils.join(module, "_TIME_API_IMPORT");
case ScheduleTagType.API_SCENARIO -> StringUtils.join(module, "_TIME_API_SCENARIO");
case ScheduleTagType.TEST_PLAN -> StringUtils.join(module, "_TIME_TEST_PLAN");
case API_IMPORT -> StringUtils.join(module, "_TIME_API_IMPORT");
case API_SCENARIO -> StringUtils.join(module, "_TIME_API_SCENARIO");
case TEST_PLAN -> StringUtils.join(module, "_TIME_TEST_PLAN");
default -> throw new MSException(Translator.get("module_type_error"));
};
}
@ -227,8 +228,13 @@ public class TaskCenterService {
Schedule schedule = checkScheduleExit(id);
schedule.setEnable(!schedule.getEnable());
scheduleService.editSchedule(schedule);
scheduleService.addOrUpdateCronJob(schedule, new JobKey(schedule.getKey(), schedule.getJob()),
new TriggerKey(schedule.getKey(), schedule.getJob()), BaseScheduleJob.class);
try {
scheduleService.addOrUpdateCronJob(schedule, new JobKey(schedule.getKey(), schedule.getJob()),
new TriggerKey(schedule.getKey(), schedule.getJob()), Class.forName(schedule.getJob()));
} catch (ClassNotFoundException e) {
LogUtils.error(e);
throw new RuntimeException(e);
}
apiScheduleNoticeService.sendScheduleNotice(schedule, userId);
String logModule = getLogModule(moduleType, module);
saveLog(List.of(schedule), userId, path, HttpMethodConstants.GET.name(), logModule, OperationLogType.UPDATE.name());
@ -304,8 +310,13 @@ public class TaskCenterService {
list.forEach(s -> {
s.setEnable(enable);
batchMapper.updateByPrimaryKeySelective(s);
scheduleService.addOrUpdateCronJob(s, new JobKey(s.getKey(), s.getJob()),
new TriggerKey(s.getKey(), s.getJob()), BaseScheduleJob.class);
try {
scheduleService.addOrUpdateCronJob(s, new JobKey(s.getKey(), s.getJob()),
new TriggerKey(s.getKey(), s.getJob()), Class.forName(s.getJob()));
} catch (ClassNotFoundException e) {
LogUtils.error(e);
throw new RuntimeException(e);
}
});
sqlSession.flushStatements();
});