From dd2f738c005b477b85a3c3a55d27c9e02c51abf1 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 5 Mar 2025 09:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CvtHarmonicCorrectionFactorsParam.java | 156 ++++++++++++------ 1 file changed, 102 insertions(+), 54 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CvtHarmonicCorrectionFactorsParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CvtHarmonicCorrectionFactorsParam.java index 3314f33b7..d64ab62c7 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CvtHarmonicCorrectionFactorsParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CvtHarmonicCorrectionFactorsParam.java @@ -11,10 +11,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import javax.validation.constraints.*; import java.math.BigDecimal; -import java.time.LocalDateTime; + /** * @@ -30,111 +29,160 @@ public class CvtHarmonicCorrectionFactorsParam { /** * cvt名称 */ - @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) + @Pattern(regexp = PatternRegex.DES32_REGEX, message = "cvt名称过长") private String cvtName; /** * cvt型号 */ - @Pattern(regexp = PatternRegex.DES32_REGEX, message = ValidMessage.DATA_TOO_LONG) + @Pattern(regexp = PatternRegex.DES32_REGEX, message = "cvt型号") private String cvtModel; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h2; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h3; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h4; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h5; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h6; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h7; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h8; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h9; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h10; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h11; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h12; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h13; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h14; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h15; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h16; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h17; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h18; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h19; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h20; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h21; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h22; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h23; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h24; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h25; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h26; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h27; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h28; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h29; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h30; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h31; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h32; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h33; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h34; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h35; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h36; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h37; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h38; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h39; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h40; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h41; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h42; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h43; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h44; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h45; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h46; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h47; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h48; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h49; - + @Digits(integer = 2, fraction = 4, message = "CVT参数格式错误，应为X.XXXX") + @NotNull(message = "CVT参数不能不为空") private BigDecimal h50;