From d79d2f12c82cac10ba28117a9ee49bc5fdc2842d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 13 十一月 2024 16:05:28 +0800
Subject: [PATCH] 1、完善通信中间件远程升级任务模块; 2、web端实现升级任务发布执行功能; 3、web端实现升级任务执行监视功能; 4、web端添加模拟升级过程逻辑。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
index 62a857a..bfe0ad6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryConditionVo.java
@@ -14,14 +14,33 @@
      * 褰撳墠鏌ヨ椤�
      */
     @Schema(description = "褰撳墠椤�", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "褰撳墠椤典笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    public Integer pageCurr ;
+    public Integer pageCurr;
 
     /**
      * 姣忛〉鏁版嵁鏉℃暟
      */
     @Schema(description = "姣忛〉璁板綍鏁�", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "姣忛〉璁板綍鏁颁笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
-    public Integer pageSize ;
+    public Integer pageSize;
 
+    /**
+     * 璁剧疆褰撳墠榛樿绗竴椤�
+     * @return
+     */
+    public Integer getPageCurr() {
+        if (pageCurr == null){
+            return 1;
+        }
+        return pageCurr;
+    }
+
+    /**
+     * 璁剧疆褰撳墠榛樿涓�椤靛崄鏉�
+     * @return
+     */
+    public Integer getPageSize() {
+        if (pageSize == null){
+            return 10;
+        }
+        return pageSize;
+    }
 }

--
Gitblit v1.8.0