From 251f61887e8c26db51df7f8d0c3b5464dc1fa6e3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 十二月 2024 16:59:34 +0800
Subject: [PATCH] （1）升级过程中死掉的RTU经过可配置的一段时间后设置成升级失败； （2）升级状态向Remote模块通知时，当升级任务结束后，仍要向remote模块通知可配置的次数；
---
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