diff --git a/src/main/java/com/qyft/gd/controller/TasksController.java b/src/main/java/com/qyft/gd/controller/TasksController.java index 0c5bc2f..969b62d 100644 --- a/src/main/java/com/qyft/gd/controller/TasksController.java +++ b/src/main/java/com/qyft/gd/controller/TasksController.java @@ -9,6 +9,7 @@ import com.qyft.gd.service.TasksService; import com.qyft.gd.system.common.base.BasePageQuery; import com.qyft.gd.system.common.result.PageResult; import com.qyft.gd.system.common.result.Result; +import com.qyft.gd.system.common.result.ResultCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -37,9 +38,18 @@ public class TasksController { return Result.success(tasksService.selectById(id)); } + @Operation(summary = "获取正在进行的实验") + @GetMapping("/getIngTask") + public Result getIngTask() { + return Result.success(tasksService.getIngTask()); + } + @Operation(summary = "添加新实验") @PostMapping("/") public Result addTask(@RequestBody TaskDTO dto) { + if (tasksService.getIngTask() != null) { + return Result.failed("存在正在运行的实验,请先停止"); + } return Result.success(tasksService.addTask(dto.getName())); } diff --git a/src/main/java/com/qyft/gd/model/entity/TaskSteps.java b/src/main/java/com/qyft/gd/model/entity/TaskSteps.java index 61dc5c2..d01b31f 100644 --- a/src/main/java/com/qyft/gd/model/entity/TaskSteps.java +++ b/src/main/java/com/qyft/gd/model/entity/TaskSteps.java @@ -28,5 +28,5 @@ public class TaskSteps { @NotBlank @Schema(description = "创建时间") - private LocalDateTime createTime; + private String createTime; } diff --git a/src/main/java/com/qyft/gd/service/BaseDataService.java b/src/main/java/com/qyft/gd/service/BaseDataService.java index 5b66da7..4fe110c 100644 --- a/src/main/java/com/qyft/gd/service/BaseDataService.java +++ b/src/main/java/com/qyft/gd/service/BaseDataService.java @@ -25,6 +25,8 @@ public class BaseDataService { @Getter Map offsetMap = new HashMap<>(); + Map ingMap = new HashMap<>(); + public BaseDataService(SysSettingsService sysSettingsService, ContainerService containerService, SysSettingsMapper sysSettingsMapper) { this.sysSettingsService = sysSettingsService; this.containerService = containerService;