From 71613548942984ad363a9d5184a9c18a1a4be50d Mon Sep 17 00:00:00 2001 From: liangdaliang Date: Mon, 9 Jun 2025 14:42:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=B0=83=E5=BA=A6=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/controller/TestTaskController.java | 14 ++++--- .../service/impl/TestTaskServiceImpl.java | 41 ++++++++++++++----- .../views/test/task/edit/executionRecord.vue | 2 +- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/test-test/src/main/java/com/test/test/controller/TestTaskController.java b/test-test/src/main/java/com/test/test/controller/TestTaskController.java index b808fcb..2b1e2cb 100644 --- a/test-test/src/main/java/com/test/test/controller/TestTaskController.java +++ b/test-test/src/main/java/com/test/test/controller/TestTaskController.java @@ -98,12 +98,12 @@ public class TestTaskController extends BaseController { testTask.setCreateBy(getLoginUser().getUsername()); testTask.setCreateTime(DateUtils.getNowDate()); int result = testTaskService.insertTestTask(testTask); - + // 如果任务状态是启用且没有被删除，则添加到定时任务管理器 if (testTask.getStatus() == 0 && "0".equals(testTask.getDelFlag())) { testTaskManager.addNewTask(testTask); } - + return toAjax(result); } catch (Exception e) { return error("新增失败：" + e.getMessage()); @@ -117,18 +117,20 @@ public class TestTaskController extends BaseController { @PostMapping("/edit") public AjaxResult edit(@RequestBody TestTask testTask) { try { + testTask.setUpdateBy(getLoginUser().getUsername()); + testTask.setUpdateTime(DateUtils.getNowDate()); // 获取原任务信息 TestTask originalTask = testTaskService.selectTestTaskById(testTask.getId()).getTask(); - + // 更新任务 int result = testTaskService.updateTestTask(testTask); - + // 如果状态或crontab发生变化，更新定时任务 - if (testTask.getStatus() != originalTask.getStatus() || + if (testTask.getStatus() != originalTask.getStatus() || !testTask.getCrontab().equals(originalTask.getCrontab())) { testTaskManager.updateTask(testTask); } - + return toAjax(result); } catch (Exception e) { return error("修改失败：" + e.getMessage()); diff --git a/test-test/src/main/java/com/test/test/service/impl/TestTaskServiceImpl.java b/test-test/src/main/java/com/test/test/service/impl/TestTaskServiceImpl.java index 4f12336..22c198c 100644 --- a/test-test/src/main/java/com/test/test/service/impl/TestTaskServiceImpl.java +++ b/test-test/src/main/java/com/test/test/service/impl/TestTaskServiceImpl.java @@ -70,7 +70,16 @@ public class TestTaskServiceImpl implements ITestTaskService { */ @Override public int insertTestTask(TestTask testTask) { - return testTaskMapper.insertTestTask(testTask); + String operUser = testTask.getCreateBy(); + int i = testTaskMapper.insertTestTask(testTask); + TestTaskLog testTaskLog = new TestTaskLog(); + testTaskLog.setTaskId(testTask.getId()); + testTaskLog.setOperType("新增"); + testTaskLog.setOperDetail("操作人：" + operUser + "新增了【" + testTask.getName() + "】定时任务测试用例"); + testTaskLog.setOperUser(operUser); + testTaskLog.setOperTime(DateUtils.getNowDate()); + testTaskLogMapper.insertTestTaskLog(testTaskLog); + return i; } /** @@ -78,8 +87,17 @@ public class TestTaskServiceImpl implements ITestTaskService { */ @Override public int updateTestTask(TestTask testTask) { + String operUser = testTask.getCreateBy(); testTask.setUpdateTime(DateUtils.getNowDate()); - return testTaskMapper.updateTestTask(testTask); + int i = testTaskMapper.updateTestTask(testTask); + TestTaskLog testTaskLog = new TestTaskLog(); + testTaskLog.setTaskId(testTask.getId()); + testTaskLog.setOperType("修改"); + testTaskLog.setOperDetail("操作人：" + operUser + "修改了【" + testTask.getName() + "】定时任务测试用例"); + testTaskLog.setOperUser(operUser); + testTaskLog.setOperTime(DateUtils.getNowDate()); + testTaskLogMapper.insertTestTaskLog(testTaskLog); + return i; } /** @@ -114,13 +132,15 @@ public class TestTaskServiceImpl implements ITestTaskService { log.error("定时任务已删除，不能执行！"); return false; } - TestTaskLog testTaskLog = new TestTaskLog(); - testTaskLog.setTaskId(id); - testTaskLog.setOperType("执行"); - testTaskLog.setOperDetail("操作人：" + operUser + "提交执行了【" + testTask.getName() + "】定时任务测试用例"); - testTaskLog.setOperUser(operUser); - testTaskLog.setOperTime(DateUtils.getNowDate()); - testTaskLogMapper.insertTestTaskLog(testTaskLog); + if (triggerType == 2) { + TestTaskLog testTaskLog = new TestTaskLog(); + testTaskLog.setTaskId(id); + testTaskLog.setOperType("执行"); + testTaskLog.setOperDetail("操作人：" + operUser + "提交执行了【" + testTask.getName() + "】定时任务测试用例"); + testTaskLog.setOperUser(operUser); + testTaskLog.setOperTime(DateUtils.getNowDate()); + testTaskLogMapper.insertTestTaskLog(testTaskLog); + } TestTaskResult testTaskResult = new TestTaskResult(); testTaskResult.setTaskId(id); testTaskResult.setTriggerTime(DateUtils.getNowDate()); @@ -148,7 +168,8 @@ public class TestTaskServiceImpl implements ITestTaskService { // 开始执行定时任务逻辑。。。 if (triggerType == 1) { // 添加定时任务定时执行 - taskManagerService.addTask(testTask, jmeterHomePath, testTaskCaseList, testTaskResult); +// taskManagerService.addTask(testTask, jmeterHomePath, testTaskCaseList, testTaskResult); + taskManagerService.executeTaskWithTestCases(testTask, jmeterHomePath, testTaskCaseList, testTaskResult); } else { // 手动立即执行 taskManagerService.executeTaskWithTestCases(testTask, jmeterHomePath, testTaskCaseList, testTaskResult); diff --git a/test-ui/src/views/test/task/edit/executionRecord.vue b/test-ui/src/views/test/task/edit/executionRecord.vue index 451a60f..6986a22 100644 --- a/test-ui/src/views/test/task/edit/executionRecord.vue +++ b/test-ui/src/views/test/task/edit/executionRecord.vue @@ -15,7 +15,7 @@
- +