From 999056f6db8b70a146f821effee908cc59fc489e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Mon, 28 Apr 2025 11:00:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/iflytop/gd/app/model/entity/Container.java | 12 +++++++++--- .../com/iflytop/gd/debug/controller/CmdDebugController.java | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iflytop/gd/app/model/entity/Container.java b/src/main/java/com/iflytop/gd/app/model/entity/Container.java index fb39b9f..0977044 100644 --- a/src/main/java/com/iflytop/gd/app/model/entity/Container.java +++ b/src/main/java/com/iflytop/gd/app/model/entity/Container.java @@ -3,7 +3,10 @@ package com.iflytop.gd.app.model.entity; import com.baomidou.mybatisplus.annotation.TableName; import com.iflytop.gd.infrastructure.repository.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Positive; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,10 +15,13 @@ import lombok.EqualsAndHashCode; @TableName("container") @Data public class Container extends BaseEntity { - @NotBlank + + @Min(value = 0, message = "类型只能为 0 或 1") + @Max(value = 1, message = "类型只能为 0 或 1") @Schema(description = "类型 0 溶液 1 废液") private Long type; + @Positive(message = "溶液id 必须是正数") @Schema(description = "溶液id") private Long solutionId; @@ -23,11 +29,11 @@ public class Container extends BaseEntity { @Schema(description = "泵id") private String pumpId; - @NotBlank + @Positive(message = "总容量 必须是正数") @Schema(description = "总容量") private Integer capacityTotal; - @NotBlank + @Positive(message = "使用容量 必须是正数") @Schema(description = "使用容量") private Integer capacityUsed; } diff --git a/src/main/java/com/iflytop/gd/debug/controller/CmdDebugController.java b/src/main/java/com/iflytop/gd/debug/controller/CmdDebugController.java index 9923fe4..325980d 100644 --- a/src/main/java/com/iflytop/gd/debug/controller/CmdDebugController.java +++ b/src/main/java/com/iflytop/gd/debug/controller/CmdDebugController.java @@ -7,6 +7,7 @@ import com.iflytop.gd.common.cmd.CommandHandler; import com.iflytop.gd.app.core.CommandHandlerRegistry; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; @@ -24,7 +25,7 @@ public class CmdDebugController { @Operation(summary = "前端调试指令") @PostMapping - public Result controlMethod(@RequestBody CmdDTO cmdDTO) { + public Result controlMethod(@Valid @RequestBody CmdDTO cmdDTO) { String commandName = cmdDTO.getCommand(); try { CommandHandler commandHandler = registry.getCommandHandler(commandName);