From 656aa4f953eb52502a6414965e46642c31b6e8ee Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 四月 2025 15:33:09 +0800
Subject: [PATCH] 设备会在多种功能码上报数据中携带报警与状态数据,这样数据库保存设备报警与状态数据可能很多,为此修改逻辑,当前实现为一设备一个小时内只保存一条报警与状态数据。

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
index 16d5841..41344a3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/webUtil/QueryResultVo.java
@@ -61,7 +61,7 @@
         }
 
         if(this.itemTotal == 0){
-            this.pageSize = 1 ;
+            this.pageSize = 10 ;
         }
         if(this.pageSize == null || this.pageSize <= 0){
             /**
@@ -69,7 +69,7 @@
              * 鏈紶鍏ュ垎椤靛弬鏁版椂锛屽彇鍏ㄩ儴璁板綍
              */
             //this.pageSize = 1 ;//渚涗笅闈綔涓洪櫎鏁�
-            this.pageSize = 10000 ;//渚涗笅闈綔涓洪櫎鏁�
+            this.pageSize = 10 ;//渚涗笅闈綔涓洪櫎鏁�
         }
 
         pageTotal = (int)Math.ceil((itemTotal==null?0.0D:itemTotal.doubleValue())/pageSize);
@@ -88,8 +88,10 @@
         this.queryStart = (this.pageCurr - 1) * this.pageSize ;
         this.queryCount = this.pageSize ;
 
-        params.put("start", this.queryStart) ;
-        params.put("count", this.queryCount) ;
+        if(params != null){
+            params.put("start", this.queryStart) ;
+            params.put("count", this.queryCount) ;
+        }
     }
 
 }

--
Gitblit v1.8.0