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

fix(任务中心): 补充后台任务运行规则修改日志 

--bug=1047955 --user=王旭 【项目任务中心】系统后台任务列表-开启/关闭/修改运行规则/删除操作-未生成系统日志 https://www.tapd.cn/55049933/s/1598388
This commit is contained in:
WangXu10 2024-10-25 16:02:59 +08:00 committed by Craftsman
parent 892917346d
commit 61e1c504be
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/project-management/src/main/java/io/metersphere/project/controller/ProjectTaskHubController.java
View File

@ -187,7 +187,7 @@ public class ProjectTaskHubController {
@Operation(summary = "项目-任务中心-后台任务更新cron表达式") @Operation(summary = "项目-任务中心-后台任务更新cron表达式")
@RequiresPermissions(PermissionConstants.PROJECT_SCHEDULE_TASK_CENTER_READ_UPDATE) @RequiresPermissions(PermissionConstants.PROJECT_SCHEDULE_TASK_CENTER_READ_UPDATE)
public void updateValue(@Validated @RequestBody ScheduleRequest request) { public void updateValue(@Validated @RequestBody ScheduleRequest request) {
baseTaskHubService.updateCron(request); baseTaskHubService.updateCron(request, SessionUtils.getUserId(), "/project/task-center/schedule/update-cron", OperationLogModule.PROJECT_MANAGEMENT_TASK_CENTER);
} }
@PostMapping("/exec-task/batch/page") @PostMapping("/exec-task/batch/page")

4
backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationTaskHubController.java
View File

@ -182,7 +182,7 @@ public class OrganizationTaskHubController {
public void batchEnable(@Validated @RequestBody TableBatchProcessDTO request) { public void batchEnable(@Validated @RequestBody TableBatchProcessDTO request) {
List<OptionDTO> projectList = baseProjectMapper.getProjectOptionsByOrgId(SessionUtils.getCurrentOrganizationId()); List<OptionDTO> projectList = baseProjectMapper.getProjectOptionsByOrgId(SessionUtils.getCurrentOrganizationId());
List<String> projectIds = projectList.stream().map(OptionDTO::getId).toList(); List<String> projectIds = projectList.stream().map(OptionDTO::getId).toList();
baseTaskHubService.scheduleBatchOperation(request, SessionUtils.getUserId(), SessionUtils.getCurrentProjectId(), "/organization/task-center/schedule/batch-enable", OperationLogModule.SETTING_ORGANIZATION_TASK_CENTER, true,projectIds); baseTaskHubService.scheduleBatchOperation(request, SessionUtils.getUserId(), SessionUtils.getCurrentProjectId(), "/organization/task-center/schedule/batch-enable", OperationLogModule.SETTING_ORGANIZATION_TASK_CENTER, true, projectIds);
} }
@ -200,7 +200,7 @@ public class OrganizationTaskHubController {
@Operation(summary = "组织-任务中心-后台任务更新cron表达式") @Operation(summary = "组织-任务中心-后台任务更新cron表达式")
@RequiresPermissions(PermissionConstants.ORGANIZATION_SCHEDULE_TASK_CENTER_READ_UPDATE) @RequiresPermissions(PermissionConstants.ORGANIZATION_SCHEDULE_TASK_CENTER_READ_UPDATE)
public void updateValue(@Validated @RequestBody ScheduleRequest request) { public void updateValue(@Validated @RequestBody ScheduleRequest request) {
baseTaskHubService.updateCron(request); baseTaskHubService.updateCron(request, SessionUtils.getUserId(), "/organization/task-center/schedule/update-cron", OperationLogModule.SETTING_ORGANIZATION_TASK_CENTER);
} }
@PostMapping("/exec-task/batch/page") @PostMapping("/exec-task/batch/page")

2
backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemTaskHubController.java
View File

@ -206,7 +206,7 @@ public class SystemTaskHubController {
@Operation(summary = "系统-任务中心-后台任务更新cron表达式") @Operation(summary = "系统-任务中心-后台任务更新cron表达式")
@RequiresPermissions(PermissionConstants.SYSTEM_SCHEDULE_TASK_CENTER_READ_UPDATE) @RequiresPermissions(PermissionConstants.SYSTEM_SCHEDULE_TASK_CENTER_READ_UPDATE)
public void updateValue(@Validated @RequestBody ScheduleRequest request) { public void updateValue(@Validated @RequestBody ScheduleRequest request) {
baseTaskHubService.updateCron(request); baseTaskHubService.updateCron(request, SessionUtils.getUserId(), "/system/task-center/schedule/update-cron", OperationLogModule.SETTING_SYSTEM_TASK_CENTER);
} }
} }

3
backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseTaskHubService.java
View File

@ -888,13 +888,14 @@ public class BaseTaskHubService {
return list; return list;
} }
public void updateCron(ScheduleRequest request) { public void updateCron(ScheduleRequest request, String userId, String path, String module) {
Schedule schedule = checkScheduleExit(request.getId()); Schedule schedule = checkScheduleExit(request.getId());
schedule.setValue(request.getCron()); schedule.setValue(request.getCron());
scheduleService.editSchedule(schedule); scheduleService.editSchedule(schedule);
try { try {
scheduleService.addOrUpdateCronJob(schedule, new JobKey(schedule.getKey(), schedule.getJob()), scheduleService.addOrUpdateCronJob(schedule, new JobKey(schedule.getKey(), schedule.getJob()),
new TriggerKey(schedule.getKey(), schedule.getJob()), Class.forName(schedule.getJob())); new TriggerKey(schedule.getKey(), schedule.getJob()), Class.forName(schedule.getJob()));
saveLog(List.of(schedule), userId, path, HttpMethodConstants.GET.name(), module, OperationLogType.UPDATE.name());
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
LogUtils.error(e); LogUtils.error(e);
throw new RuntimeException(e); throw new RuntimeException(e);