From fbfc2ba9276e79950a0949324bc8ba976cdca99b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 五月 2024 17:29:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/FaceThresholdForm.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/FaceThresholdForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/FaceThresholdForm.java
index 18a018f..2a0454b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/FaceThresholdForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/FaceThresholdForm.java
@@ -8,6 +8,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
/**
* 浜鸿劯宸ュ崟闃堝��
@@ -21,45 +22,40 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id,淇敼蹇呬紶", required = false)
- @NotBlank(message = "璇烽�夋嫨淇敼鏁版嵁")
- private String id;
+ @NotNull(message = "璇烽�夋嫨淇敼鏁版嵁")
+ private Integer id;
- @NotBlank(message = "璇烽�夋嫨璁惧绫诲瀷")
+ @NotNull(message = "璇烽�夋嫨璁惧绫诲瀷")
private BusinessTypeEnum monitorType;
- @NotNull(message = "璇疯緭鍏ヨ秴鏃跺ぉ鏁�")
- private Integer timeout;
-
/** 鎶撴媿閲� */
- @NotBlank(message = "璇峰～鍐欐姄鎷嶉噺")
- private String captureNum;
+ @NotNull(message = "璇峰～鍐欐姄鎷嶉噺")
+ private Integer captureNum;
+ private Integer captureNumAuto;
/** 鍙婃椂鐜� */
- @NotBlank(message = "璇峰～鍐欏強鏃剁巼")
- private String timelyRate;
+ @NotNull(message = "璇峰～鍐欏強鏃剁巼")
+ private BigDecimal timelyRate;
+ private BigDecimal timelyRateAuto;
/** 寤惰繜閲� */
- @NotBlank(message = "璇峰～鍐欏欢杩熼噺")
- private String delayAmount;
-
- /** 鎶芥閲� */
- @NotBlank(message = "璇峰～鍐欐娊妫�閲�")
- private String samplingInspectionNum;
+ @NotNull(message = "璇峰～鍐欏欢杩熼噺")
+ private Long delayAmount;
+ private Long delayAmountAuto;
/** 璁惧娲昏穬鐜� */
- @NotBlank(message = "璇峰～鍐欒澶囨椿璺冪巼")
- private String deviceActiveRate;
+ @NotNull(message = "璇峰～鍐欒澶囨椿璺冪巼")
+ private BigDecimal deviceActiveRate;
+ private BigDecimal deviceActiveRateAuto;
/** 鎶撴媿鍙婃椂鐜� */
- @NotBlank(message = "璇峰～鍐欐姄鎷嶅強鏃剁巼")
- private String timelyCapture;
-
- /** 鏃堕挓涓嶅噯纭巼 */
- @NotBlank(message = "璇峰～鍐欐椂閽熶笉鍑嗙‘鐜�")
- private String timeNotAccuracy;
+ @NotNull(message = "璇峰～鍐欐姄鎷嶅強鏃剁巼")
+ private BigDecimal timelyCapture;
+ private BigDecimal timelyCaptureAuto;
/** 鏃堕挓鍑嗙‘鐜� */
- @NotBlank(message = "璇峰～鍐欐椂閽熷噯纭巼")
- private String timeAccuracy;
+ @NotNull(message = "璇峰～鍐欐椂閽熷噯纭巼")
+ private BigDecimal timeAccuracy;
+ private BigDecimal timeAccuracyAuto;
}
--
Gitblit v1.8.0