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 4034176..c2da3fd 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 @@ -120,8 +120,9 @@ public class TestTaskController extends BaseController { @PostMapping("/run") public AjaxResult run(@RequestBody IDQO qo) { // 异步执行任务 + String username = SecurityUtils.getUsername(); CompletableFuture.runAsync(() -> { - testTaskService.executeTestTaskById(qo.getId(), 2, null, jmeterHomePath, SecurityUtils.getUsername()); + testTaskService.executeTestTaskById(qo.getId(), 2, null, jmeterHomePath, username); }); return toAjax(true); } diff --git a/test-test/src/main/java/com/test/test/domain/TestTaskLog.java b/test-test/src/main/java/com/test/test/domain/TestTaskLog.java index 9effee0..8ff6496 100644 --- a/test-test/src/main/java/com/test/test/domain/TestTaskLog.java +++ b/test-test/src/main/java/com/test/test/domain/TestTaskLog.java @@ -42,7 +42,7 @@ public class TestTaskLog extends BaseEntity private String operUser; /** 操作时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd") private Date operTime; } diff --git a/test-test/src/main/java/com/test/test/domain/TestTaskResult.java b/test-test/src/main/java/com/test/test/domain/TestTaskResult.java index 43406f4..a16761e 100644 --- a/test-test/src/main/java/com/test/test/domain/TestTaskResult.java +++ b/test-test/src/main/java/com/test/test/domain/TestTaskResult.java @@ -30,13 +30,13 @@ public class TestTaskResult extends BaseEntity private Long taskId; /** 触发时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "触发时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "触发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date triggerTime; /** 执行时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date startTime; /** 触发方式：1-定时任务；2-手动 */ diff --git a/test-ui/src/views/test/task/edit/executionRecord.vue b/test-ui/src/views/test/task/edit/executionRecord.vue index f256c7c..451a60f 100644 --- a/test-ui/src/views/test/task/edit/executionRecord.vue +++ b/test-ui/src/views/test/task/edit/executionRecord.vue @@ -1,60 +1,44 @@