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/entity/YwThreshold.java | 89 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 84 insertions(+), 5 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java index 455439a..994f23a 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwThreshold.java @@ -2,15 +2,15 @@ import annotation.Excel; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.system.entity.BaseEntity; import enumeration.general.BusinessTypeEnum; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; /** * 杩愮淮闃堝�煎璞� t_yw_threshold @@ -20,7 +20,7 @@ */ @Data @TableName("t_yw_threshold") -public class YwThreshold extends BaseEntity { +public class YwThreshold { private static final long serialVersionUID = 1L; @@ -29,6 +29,16 @@ */ @TableId(value = "id", type = IdType.AUTO) private Integer id; + + /** 鍒涘缓鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("create_time") + private Date createTime; + + /** 鏇存柊鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(value = "update_time", fill = FieldFill.UPDATE) + private Date updateTime; /** * 璁惧绫诲瀷锛�1浜鸿劯 2杞﹁締 3瑙嗛 @@ -82,10 +92,62 @@ /*---------------------------- 浜鸿劯瀛楁 ----------------------------------------------*/ + /** 鎶撴媿閲忓伐鍗曢槇鍊� */ + @TableField("capture_num") + private Integer captureNum; + /** 鎶撴媿閲忎笅鍙戦槇鍊� */ + @TableField("capture_num_auto") + private Integer captureNumAuto; + /** 鍙婃椂鐜囧伐鍗曢槇鍊� */ + @TableField("timely_rate") + private BigDecimal timelyRate; + + /** 鍙婃椂鐜囦笅鍙戦槇鍊� */ + @TableField("timely_rate_auto") + private BigDecimal timelyRateAuto; + + /** 寤惰繜閲忓伐鍗曢槇鍊� */ + @TableField("delay_amount") + private Long delayAmount; + + /** 寤惰繜閲忎笅鍙戦槇鍊� */ + @TableField("delay_amount_auto") + private Long delayAmountAuto; /*---------------------------- 杞﹁締瀛楁 ----------------------------------------------*/ + /** 杩囪溅鏁版嵁閲忓伐鍗曢槇鍊� */ + @TableField("pass_car_num") + private Integer passCarNum; + + /** 杩囪溅鏁版嵁閲忎笅鍙戦槇鍊� */ + @TableField("pass_car_num_auto") + private Integer passCarNumAuto; + + /** 杩囪溅缂哄け鐜囧伐鍗曢槇鍊� */ + @TableField("pass_car_miss_rate") + private BigDecimal passCarMissRate; + + /** 杩囪溅缂哄け鐜囦笅鍙戦槇鍊� */ + @TableField("pass_car_miss_rate_auto") + private BigDecimal passCarMissRateAuto; + + /** 鏈夋晥杩囪溅鏁版嵁閲忓伐鍗曢槇鍊� */ + @TableField("pass_car_effective_num") + private Integer passCarEffectiveNum; + + /** 鏈夋晥杩囪溅鏁版嵁閲忎笅鍙戦槇鍊� */ + @TableField("pass_car_effective_num_auto") + private Integer passCarEffectiveNumAuto; + + /** 鏃堕挓鍑嗙‘鐜囧伐鍗曢槇鍊� */ + @TableField("time_accuracy") + private BigDecimal timeAccuracy; + + /** 鏃堕挓鍑嗙‘鐜囦笅鍙戦槇鍊� */ + @TableField("time_accuracy_auto") + private BigDecimal timeAccuracyAuto; /** * 閫昏緫鍒犻櫎锛�0鏈垹闄� 1鍒犻櫎 @@ -93,4 +155,21 @@ @TableField("deleted") private String deleted; + /*---------------------------- 鍏叡 ----------------------------------------------*/ + /** 璁惧娲昏穬鐜囧伐鍗曢槇鍊� */ + @TableField("device_active_rate") + private BigDecimal deviceActiveRate; + + /** 璁惧娲昏穬鐜囦笅鍙戦槇鍊� */ + @TableField("device_active_rate_auto") + private BigDecimal deviceActiveRateAuto; + + /** 鎶撴媿鍙婃椂鐜囧伐鍗曢槇鍊� */ + @TableField("timely_capture") + private BigDecimal timelyCapture; + + /** 鎶撴媿鍙婃椂鐜囦笅鍙戦槇鍊� */ + @TableField("timely_capture_auto") + private BigDecimal timelyCaptureAuto; + } -- Gitblit v1.8.0