diff --git a/src/main/java/com/iflytop/gd/app/model/dto/CmdDTO.java b/src/main/java/com/iflytop/gd/app/model/dto/CmdDTO.java
index 5fc6a14..4220a0a 100644
--- a/src/main/java/com/iflytop/gd/app/model/dto/CmdDTO.java
+++ b/src/main/java/com/iflytop/gd/app/model/dto/CmdDTO.java
@@ -3,6 +3,7 @@ package com.iflytop.gd.app.model.dto;
 import cn.hutool.json.JSONUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.Map;
@@ -12,11 +13,11 @@ import java.util.Optional;
 @Data
 public class CmdDTO {
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "指令id，前端生成唯一ID")
     private String commandId;
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "命令名称")
     private String command;
 
diff --git a/src/main/java/com/iflytop/gd/app/model/dto/LoginDTO.java b/src/main/java/com/iflytop/gd/app/model/dto/LoginDTO.java
index c79dd95..68a23b3 100644
--- a/src/main/java/com/iflytop/gd/app/model/dto/LoginDTO.java
+++ b/src/main/java/com/iflytop/gd/app/model/dto/LoginDTO.java
@@ -2,6 +2,7 @@ package com.iflytop.gd.app.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -11,11 +12,11 @@ import lombok.Data;
 @Data
 public class LoginDTO {
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "用户名", example = "admin")
     private String username;
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "用户密码", example = "12345")
     private String password;
 
diff --git a/src/main/java/com/iflytop/gd/app/model/dto/PauseCraftsDto.java b/src/main/java/com/iflytop/gd/app/model/dto/PauseCraftsDto.java
index ebffcaa..c64e8f4 100644
--- a/src/main/java/com/iflytop/gd/app/model/dto/PauseCraftsDto.java
+++ b/src/main/java/com/iflytop/gd/app/model/dto/PauseCraftsDto.java
@@ -2,12 +2,13 @@ package com.iflytop.gd.app.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "暂停执行工艺")
 @Data
 public class PauseCraftsDto {
-    @NotBlank
+    @NotNull
     @Schema(description = "加热区id")
     private String heatId;
 }
diff --git a/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java b/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java
index 657225f..bbc67fe 100644
--- a/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java
+++ b/src/main/java/com/iflytop/gd/app/model/dto/ResumeCraftsDto.java
@@ -2,12 +2,13 @@ package com.iflytop.gd.app.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "恢复执行工艺")
 @Data
 public class ResumeCraftsDto {
-    @NotBlank
+    @NotNull
     @Schema(description = "加热区id")
     private String heatId;
 }
diff --git a/src/main/java/com/iflytop/gd/app/model/dto/StartCraftsDTO.java b/src/main/java/com/iflytop/gd/app/model/dto/StartCraftsDTO.java
index f7b711a..7ce928c 100644
--- a/src/main/java/com/iflytop/gd/app/model/dto/StartCraftsDTO.java
+++ b/src/main/java/com/iflytop/gd/app/model/dto/StartCraftsDTO.java
@@ -2,6 +2,7 @@ package com.iflytop.gd.app.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import lombok.Data;
 
@@ -9,9 +10,11 @@ import lombok.Data;
 @Data
 public class StartCraftsDTO {
     @Positive(message = "工艺ID 必须是正数")
+    @NotNull
     @Schema(description = "工艺id")
     private Long craftId;
-    @NotBlank
+
+    @NotNull
     @Schema(description = "加热区id")
     private String heatId;
 }
diff --git a/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java b/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java
index 536fd4d..235dbfa 100644
--- a/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java
+++ b/src/main/java/com/iflytop/gd/app/model/dto/StopCraftsDto.java
@@ -2,12 +2,13 @@ package com.iflytop.gd.app.model.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "恢复执行工艺")
 @Data
 public class StopCraftsDto {
-    @NotBlank
+    @NotNull
     @Schema(description = "加热区id")
     private String heatId;
 }
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 0977044..4bf4d1e 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,10 +3,7 @@ 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 jakarta.validation.constraints.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,22 +15,26 @@ public class Container extends BaseEntity {
 
     @Min(value = 0, message = "类型只能为 0 或 1")
     @Max(value = 1, message = "类型只能为 0 或 1")
+    @NotNull
     @Schema(description = "类型 0 溶液 1 废液")
     private Long type;
 
     @Positive(message = "溶液id 必须是正数")
+    @NotNull
     @Schema(description = "溶液id")
     private Long solutionId;
 
-    @NotBlank
+    @NotNull
     @Schema(description = "泵id")
     private String pumpId;
 
     @Positive(message = "总容量 必须是正数")
+    @NotNull
     @Schema(description = "总容量")
     private Integer capacityTotal;
 
     @Positive(message = "使用容量 必须是正数")
+    @NotNull
     @Schema(description = "使用容量")
     private Integer capacityUsed;
 }
diff --git a/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java b/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java
index 99e947c..ef786b9 100644
--- a/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java
+++ b/src/main/java/com/iflytop/gd/app/model/entity/Crafts.java
@@ -4,6 +4,7 @@ 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.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,14 +15,16 @@ import lombok.EqualsAndHashCode;
 @Data
 public class Crafts extends BaseEntity {
 
-    @NotBlank
+    @NotNull
     @Schema(description = "工艺名称")
     private String name;
 
+    @NotNull
     @Schema(description = "工艺步骤")
     private String steps;
 
     @Positive(message = "矿石ID 必须是正数")
+    @NotNull
     @Schema(description = "矿石ID")
     private Long oresId;
 }
diff --git a/src/main/java/com/iflytop/gd/app/model/entity/Ores.java b/src/main/java/com/iflytop/gd/app/model/entity/Ores.java
index 718e57e..18698a6 100644
--- a/src/main/java/com/iflytop/gd/app/model/entity/Ores.java
+++ b/src/main/java/com/iflytop/gd/app/model/entity/Ores.java
@@ -4,6 +4,7 @@ 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.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @Data
 public class Ores extends BaseEntity {
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "矿石名称")
     private String name;
 
diff --git a/src/main/java/com/iflytop/gd/app/model/entity/Solutions.java b/src/main/java/com/iflytop/gd/app/model/entity/Solutions.java
index f1d47c0..00de4e7 100644
--- a/src/main/java/com/iflytop/gd/app/model/entity/Solutions.java
+++ b/src/main/java/com/iflytop/gd/app/model/entity/Solutions.java
@@ -4,6 +4,7 @@ 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.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,7 +14,7 @@ import lombok.EqualsAndHashCode;
 @Data
 public class Solutions extends BaseEntity {
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "溶液名称")
     private String name;
 
diff --git a/src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java b/src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java
index f36c2ce..49db9cc 100644
--- a/src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java
+++ b/src/main/java/com/iflytop/gd/infrastructure/repository/entity/User.java
@@ -7,6 +7,7 @@ import com.iflytop.gd.common.enums.FixedUser;
 import com.iflytop.gd.common.enums.UsrRole;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,23 +20,23 @@ import lombok.EqualsAndHashCode;
 @Data
 public class User extends BaseEntity {
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "用户名")
     private String username;
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "昵称")
     private String nickname;
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "密码")
     private String password;
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "人员角色")
     private UsrRole role;
 
-    @NotBlank()
+    @NotNull
     @Schema(description = "是否删除(0-否 1-是)")
     private Deleted deleted;