From 0eb4f97f13d0027eda8341702c73bbf567482897 Mon Sep 17 00:00:00 2001 From: xjm Date: Wed, 25 Sep 2024 15:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=A1=E9=AA=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gunshi/project/xyt/model/FileAssociations.java | 3 ++- .../java/com/gunshi/project/xyt/model/PersonnelPlanLog.java | 2 +- src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java | 2 +- src/main/java/com/gunshi/project/xyt/model/StRsvrRReal.java | 5 +++-- src/main/java/com/gunshi/project/xyt/model/StStbprpCctv.java | 5 +++-- src/main/java/com/gunshi/project/xyt/model/StWaterRReal.java | 3 ++- src/main/java/com/gunshi/project/xyt/model/SysDictB.java | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java b/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java index 05e4334..f50599f 100644 --- a/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java +++ b/src/main/java/com/gunshi/project/xyt/model/FileAssociations.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; @@ -36,7 +37,7 @@ public class FileAssociations implements Serializable { */ @TableId(value="id", type= IdType.AUTO) @Schema(description="主键") - @NotBlank(message = "主键不能为空") + @NotNull(message = "主键不能为空") @JsonSerialize(using = ToStringSerializer.class) private Long id; diff --git a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java index 272ce60..3866b98 100644 --- a/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java +++ b/src/main/java/com/gunshi/project/xyt/model/PersonnelPlanLog.java @@ -52,7 +52,7 @@ public class PersonnelPlanLog extends CommUpdate implements Serializable { @TableField(value="plan_id") @Schema(description="培训计划主键") @JsonSerialize(using = ToStringSerializer.class) - @NotBlank(message = "培训计划不能为空",groups = {Insert.class, Update.class}) + @NotNull(message = "培训计划不能为空",groups = {Insert.class, Update.class}) private Long planId; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java b/src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java index b771e97..c5de6c6 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java +++ b/src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java @@ -35,7 +35,7 @@ public class StAddvcdD implements Serializable { @TableId(value="adcd", type= IdType.AUTO) @Schema(description="行政区划编码") @Size(max = 15,message = "行政区划编码最大长度要小于 15") - @NotNull(message = "行政区划编码不能为空") + @NotBlank(message = "行政区划编码不能为空") private String adcd; /** diff --git a/src/main/java/com/gunshi/project/xyt/model/StRsvrRReal.java b/src/main/java/com/gunshi/project/xyt/model/StRsvrRReal.java index e9d2a8a..10e8f68 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StRsvrRReal.java +++ b/src/main/java/com/gunshi/project/xyt/model/StRsvrRReal.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; @@ -45,7 +46,7 @@ public class StRsvrRReal implements Serializable { @TableField(value="tm") @Schema(description="tm") // @Size(max = 0,message = "tm最大长度要小于 0") - @NotBlank(message = "tm不能为空") + @NotNull(message = "tm不能为空") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date tm; @@ -127,7 +128,7 @@ public class StRsvrRReal implements Serializable { @TableField(value="chtm") @Schema(description="chtm") // @Size(max = 0,message = "chtm最大长度要小于 0") - @NotBlank(message = "chtm不能为空") + @NotNull(message = "chtm不能为空") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date chtm; diff --git a/src/main/java/com/gunshi/project/xyt/model/StStbprpCctv.java b/src/main/java/com/gunshi/project/xyt/model/StStbprpCctv.java index 34280b1..ae29f5a 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StStbprpCctv.java +++ b/src/main/java/com/gunshi/project/xyt/model/StStbprpCctv.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -34,12 +35,12 @@ public class StStbprpCctv implements Serializable { @TableField(value = "stcd") @Schema(description="测站编码") - @NotNull(message = "测站编码不能为空", groups = {Insert.class,Update.class}) + @NotBlank(message = "测站编码不能为空", groups = {Insert.class,Update.class}) private String stcd; @TableField(value = "cam_id") @Schema(description="视频id") - @NotNull(message = "视频id不能为空", groups = {Insert.class,Update.class}) + @NotBlank(message = "视频id不能为空", groups = {Insert.class,Update.class}) private String camId; } diff --git a/src/main/java/com/gunshi/project/xyt/model/StWaterRReal.java b/src/main/java/com/gunshi/project/xyt/model/StWaterRReal.java index 0ecb456..8a3632b 100644 --- a/src/main/java/com/gunshi/project/xyt/model/StWaterRReal.java +++ b/src/main/java/com/gunshi/project/xyt/model/StWaterRReal.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.gunshi.core.dateformat.DateFormatString; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; @@ -44,7 +45,7 @@ public class StWaterRReal implements Serializable { @TableField(value="tm") @Schema(description="时间") // @Size(max = 0,message = "时间最大长度要小于 0") - @NotBlank(message = "时间不能为空") + @NotNull(message = "时间不能为空") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date tm; diff --git a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java b/src/main/java/com/gunshi/project/xyt/model/SysDictB.java index 446cd99..e683ad4 100644 --- a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java +++ b/src/main/java/com/gunshi/project/xyt/model/SysDictB.java @@ -86,7 +86,7 @@ public class SysDictB implements Serializable { @TableField(value="create_tm") @Schema(description="创建时间") // @Size(max = 0,message = "创建时间最大长度要小于 0") -// @NotBlank(message = "创建时间不能为空") +// @NotNull(message = "创建时间不能为空") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date createTm;