From 18fc70a0c4f2bd6c69ccfd58c1b01edc03d87e73 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期二, 23 七月 2024 15:45:45 +0800 Subject: [PATCH] 2024-07-23 朱宝民 PC端及小程序自动关阀(定时、定量),项目信息移入配置文件 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 46 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java index 1d632e8..1042061 100644 --- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java +++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java @@ -5,6 +5,8 @@ import com.dy.common.po.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -20,22 +22,17 @@ @Data @Schema(title = "鎺у埗鍣ㄨ鍥惧璞�") public class VoController implements BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 202401241704003L; @Schema(title = "ID") @ExcelProperty("ID") @ColumnWidth(10) - private Long id; + private String id; - @Schema(title = "鎺у埗鍣ㄧ紪鍙�") - @ExcelProperty("鎺у埗鍣ㄧ紪鍙�") + @Schema(title = "鎺у埗鍣ㄥ湴鍧�") + @ExcelProperty("鎺у埗鍣ㄥ湴鍧�") @ColumnWidth(15) - private String code; - - @Schema(title = "鍦ㄧ嚎鐘舵��") - @ExcelProperty("鍦ㄧ嚎鐘舵��") - @ColumnWidth(15) - private String state; + private String rtuAddr; @Schema(title = "缁戝畾鍙栨按鍙�") @ExcelProperty("缁戝畾鍙栨按鍙�") @@ -45,12 +42,33 @@ @Schema(title = "缁戝畾娆℃暟") @ExcelProperty("缁戝畾娆℃暟") @ColumnWidth(10) - private Integer bindings; + private Integer bindNumber; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @Schema(title = "鏈�杩戜笂鎶ユ椂闂�") - @ExcelProperty("鏈�杩戜笂鎶ユ椂闂�") + @Schema(title = "鍙戠幇鏃ユ湡鏃堕棿") + @ExcelProperty("鍙戠幇鏃ユ湡鏃堕棿") @ColumnWidth(30) - private Date operateDt; + private Date findDt; + +// @Schema(title = "鍦ㄧ嚎鐘舵��") +// @ExcelProperty("鍦ㄧ嚎鐘舵��") +// @ColumnWidth(6) +// private String onlineState; + + /** + * 鏄惁鍦ㄧ嚎 + */ + private Boolean isOnLine; + + + @Schema(title = "閫氳鍗忚") + @ExcelProperty("閫氳鍗忚") + @ColumnWidth(10) + private String protocol; + + @Schema(title = "澶囨敞") + @ExcelProperty("澶囨敞") + @ColumnWidth(10) + private String remarks; } -- Gitblit v1.8.0