From acdbf06288c8cbeac4abe3518e8157d753e72574 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 19 六月 2024 17:49:47 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/QueryVo.java | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/QueryVo.java index 23b3f73..60ac5bd 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/QueryVo.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/QueryVo.java @@ -2,6 +2,8 @@ import com.dy.common.webUtil.QueryConditionVo; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; import lombok.*; /** @@ -20,12 +22,30 @@ @Schema(name = "鎺у埗鍣ㄦ煡璇㈡潯浠�") public class QueryVo extends QueryConditionVo { + @Schema(description = "鎺у埗鍣↖D") + private Long id; + @Schema(description = "鎺у埗鍣ㄧ紪鍙�") private String controllerCode; - @Schema(description = "鍦ㄧ嚎鐘舵��") - public Integer onlineState; + @Schema(description = "鎺у埗鍣ㄥ湴鍧�") + private String rtuAddr; + +// @Schema(description = "鍦ㄧ嚎鐘舵��") +// public Integer onlineState; @Schema(description = "缁戝畾鏁伴噺") public Integer bindNumber; + + /** + * 涓棿浠惰繑鍥炵殑RTU鍦ㄧ嚎鎯呭喌瀵硅薄鏁扮粍 + */ + private String onLineMap; + + /** + * 鏄惁鍦ㄧ嚎 + */ + @Max(value = 1,message = "鏄惁鍦ㄧ嚎浠呭厑璁镐负鐪熸垨鍋�") + @Min(value = 0,message = "鏄惁鍦ㄧ嚎浠呭厑璁镐负鐪熸垨鍋�") + private Boolean isOnLine; } -- Gitblit v1.8.0